diff --git a/main/admin/user_import.php b/main/admin/user_import.php
index 518882d020..715aef808f 100644
--- a/main/admin/user_import.php
+++ b/main/admin/user_import.php
@@ -68,9 +68,9 @@ function validate_data($users) {
         // 4. Check classname
         $usergroup = new UserGroup();
         if (!empty($user['ClassName'])) {
-            $class_name = explode('|', trim($user['ClassName']));
-            foreach ($class_name as $class) {
-                if (!$usergroup -> usergroup_exists($class)) {
+            $className = explode('|', trim($user['ClassName']));
+            foreach ($className as $class) {
+                if (!$usergroup->usergroup_exists($class)) {
                     $user['error'] = get_lang('ClassNameNotAvailable');
                     $errors[] = $user;
                 }
@@ -158,10 +158,10 @@ function save_data($users) {
             }
             $usergroup = new UserGroup();
             if (!empty($user['ClassName'])) {
-                $class_name = explode('|', trim($user['ClassName']));
-                foreach ($class_name as $class) {
-                    $class_id = $usergroup -> get_id_by_name($class);
-                    $usergroup -> add_user($user_id, $class_id);
+                $className = explode('|', trim($user['ClassName']));
+                foreach ($className as $class) {
+                    $classId = $usergroup->get_id_by_name($class);
+                    $usergroup->add_user($user_id, $classId);
                 }
                 
             }
diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index 0fb26946c3..babec31564 100644
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -699,15 +699,16 @@ if (!empty($action)) {
 			case 'show_message' :
                 if (!empty($_GET['message'])) {
                     $message = Display :: return_message(stripslashes($_GET['message']), 'confirmation');
-                }
-
-                if (!empty($_GET['warn'])) {
-                	// to prevent too long messages
-                	if ($_GET['warn'] == 'session_message'){
-                        $_GET['warn'] = $_SESSION['session_message_import_users'];
-                	}
-                	$message = Display::return_message(urldecode($_GET['warn']),'warning', false);
-                }
+                } else {
+
+                    if (!empty($_GET['warn'])) {
+                    	// to prevent too long messages
+                    	if ($_GET['warn'] == 'session_message'){
+                            $_GET['warn'] = $_SESSION['session_message_import_users'];
+                    	}
+                    	$message = Display::return_message(urldecode($_GET['warn']),'warning', false);
+                    }
+               }
 
 				break;
 			case 'delete_user' :
diff --git a/main/inc/lib/usergroup.lib.php b/main/inc/lib/usergroup.lib.php
index 51d4618003..38dc85c0b5 100644
--- a/main/inc/lib/usergroup.lib.php
+++ b/main/inc/lib/usergroup.lib.php
@@ -781,13 +781,13 @@ class UserGroup extends Model
 	 * @param int $user_id The user id
 	 * @param int $class_id The class id
 	 */
-	function add_user($user_id, $class_id)
+	public function add_user($userId, $classId)
     {   
-         $table_rel_user = Database::get_main_table(TABLE_USERGROUP_REL_USER);
-         $user_id  = intval($user_id);
-         $class_id = intval($class_id);
-	       $sql = "INSERT INTO $table_rel_user SET user_id = '".$user_id."', usergroup_id='".$class_id."'";
-	       Database::query($sql);
+        $table_rel_user = Database::get_main_table(TABLE_USERGROUP_REL_USER);
+        $userId  = intval($userId);
+        $classId = intval($classId);
+        $sql = "INSERT INTO $table_rel_user SET user_id = '".$userId."', usergroup_id='".$classId."'";
+	    Database::query($sql);
     }