diff --git a/admin/inc/class.admin_import_users_csv.inc.php b/admin/inc/class.admin_import_users_csv.inc.php
index 35434a869f..40db135bef 100644
--- a/admin/inc/class.admin_import_users_csv.inc.php
+++ b/admin/inc/class.admin_import_users_csv.inc.php
@@ -204,7 +204,7 @@ class admin_import_users_csv implements importexport_iface_import_plugin  {
 			case 'create' :
 			case 'update' :
 				$command = new admin_cmd_edit_user(array(
-					'account' => $_action=='create'?null:(int)$_data['account_lid'],
+					'account' => $_action=='create'?null:(int)$_data['account_id'],
 					'set' => $_data
 				)+(array)$admin_cmd);
 
diff --git a/admin/inc/class.admin_wizard_import_users_csv.inc.php b/admin/inc/class.admin_wizard_import_users_csv.inc.php
index e9cb65d7d3..bd6c228510 100644
--- a/admin/inc/class.admin_wizard_import_users_csv.inc.php
+++ b/admin/inc/class.admin_wizard_import_users_csv.inc.php
@@ -59,8 +59,19 @@ class admin_wizard_import_users_csv extends importexport_wizard_basic_import_csv
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
-		$content['msg'] .= "\n*" ;
-		
+
+		return $result;
+	}
+
+	/**
+	* Edit conditions - remove account_id as condition option
+	*/
+	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
+	{
+		$result = parent::wizard_step55($content, $sel_options, $readonlys, $preserv);
+
+		unset($sel_options['string']['account_id']);
+
 		return $result;
 	}
 }