diff --git a/core/users/user_imports.php b/core/users/user_imports.php
index 4cefe880e7..3cebb54c1d 100644
--- a/core/users/user_imports.php
+++ b/core/users/user_imports.php
@@ -62,26 +62,25 @@
 
 //save the data to the csv file
 	if (isset($_POST['data'])) {
-		$file = $_SESSION['server']['temp']['dir']."/users-".$_SESSION['domain_name'].".csv";
-		file_put_contents($file, $_POST['data']);
-		$_SESSION['file'] = $file;
-	}
-
-//copy the csv file
-	//$_POST['submit'] == "Upload" &&
-	if (is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('user_imports')) {
-		if ($_POST['type'] == 'csv') {
-			move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name']);
-			$save_msg = "Uploaded file to ".$_SESSION['server']['temp']['dir']."/". htmlentities($_FILES['ulfile']['name']);
-			//system('chmod -R 744 '.$_SESSION['server']['temp']['dir'].'*');
-			unset($_POST['txtCommand']);
-			$file = $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name'];
+		$file = $_SESSION['server']['temp']['dir'].'/users-'.$_SESSION['domain_name'].'.csv';
+		if (file_put_contents($file, $_POST['data'])) {
 			$_SESSION['file'] = $file;
 		}
 	}
 
+//copy the csv file
+	//$_POST['submit'] == "Upload" &&
+	if (is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('user_import')) {
+		if ($_POST['type'] == 'csv') {
+			$file = $_SESSION['server']['temp']['dir'].'/users-'.$_SESSION['domain_name'].'.csv';
+			if (move_uploaded_file($_FILES['ulfile']['tmp_name'], $file)) {
+				$_SESSION['file'] = $file;
+			}
+		}
+	}
+
 //get the schema
-	if (strlen($delimiter) > 0) {
+	if (strlen($delimiter) > 0 && file_exists($_SESSION['file'])) {
 		//get the first line
 			$line = fgets(fopen($_SESSION['file'], 'r'));
 			$line_fields = explode($delimiter, $line);