diff --git a/main/course_progress/thematic.php b/main/course_progress/thematic.php
index b00053024c..3ad3218c6e 100755
--- a/main/course_progress/thematic.php
+++ b/main/course_progress/thematic.php
@@ -14,7 +14,7 @@ api_protect_course_script(true);
 $token = Security::get_token();
 $url_token = "&sec_token=".$token;
 $user_info = api_get_user_info();
-$param_gradebook = '&'.api_get_cidreq();
+$params = '&'.api_get_cidreq();
 
 if (api_is_allowed_to_edit(null, true)) {
     echo '<div class="actions">';
@@ -115,25 +115,25 @@ if ($action == 'thematic_list') {
                 // Thematic title
                 $actions_first_col  = Display::url(
                     Display::return_icon('cd.gif', get_lang('Copy')),
-                    'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$my_thematic_id.$param_gradebook.$url_token
+                    'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$my_thematic_id.$params.$url_token
                 );
                 if (api_get_session_id() == 0 ) {
 
                     if ($thematic['display_order'] > 1) {
-                        $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$param_gradebook.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).'</a>';
+                        $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).'</a>';
                     } else {
                         $actions_first_col .= ' '.Display::return_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
                     }
                     if (isset($thematic['max_thematic_item']) && $thematic['display_order'] < $thematic['max_thematic_item']) {
-                        $actions_first_col .= ' <a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$param_gradebook.$url_token.'">'.Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).'</a>';
+                        $actions_first_col .= ' <a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).'</a>';
                     } else {
                         $actions_first_col .= ' '.Display::return_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
                     }
 
                 }
                 if (api_get_session_id() == $thematic['session_id']) {
-                    $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$my_thematic_id.$param_gradebook.$url_token.'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
-                    $actions_first_col .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$my_thematic_id.$param_gradebook.$url_token.'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                    $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
+                    $actions_first_col .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
                 }
 
                 $actions_first_col = Display::div($actions_first_col, array('id'=>'thematic_id_content_'.$thematic['id'], 'class'=>'thematic_tools'));
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index ebc7ce4ba6..c15aef5d49 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -1427,7 +1427,9 @@ function _api_format_user($user, $add_password = false)
         'theme',
         'language',
         'creator_id',
-        'registration_date'
+        'registration_date',
+        'hr_dept_id',
+        'expiration_date'
     );
 
     foreach ($attributes as $attribute) {
@@ -4237,7 +4239,7 @@ function api_display_language_form($hide_if_no_choice = false)
             jumpMenu("parent",this,0);
         });
     });
-    
+
     function jumpMenu(targ,selObj,restore){ // v3.0
         eval(targ+".location=\'"+selObj.options[selObj.selectedIndex].value+"\'");
         if (restore) selObj.selectedIndex=0;
@@ -4357,7 +4359,7 @@ function api_get_language_from_type($lang_type)
                     if ($c) {
                         $cidReq = $c;
                     }
-                } 
+                }
             }
             $_course = api_get_course_info($cidReq);
             if (isset($_course['language']) && !empty($_course['language']))
diff --git a/main/mySpace/student.php b/main/mySpace/student.php
index 594c81fbbb..b965da106f 100755
--- a/main/mySpace/student.php
+++ b/main/mySpace/student.php
@@ -164,7 +164,16 @@ function get_users($from, $limit, $column, $direction)
             $detailsLink =  '<a href="myStudents.php?student='.$student_id.'">
 				             <img src="'.api_get_path(WEB_IMG_PATH).'2rightarrow.gif" border="0" /></a>';
         }
-        $row[] = $detailsLink;
+
+        $lostPasswordLink = '';
+        if (api_is_drh() || api_is_platform_admin()) {
+            $lostPasswordLink = '&nbsp;'.Display::url(
+                    Display::return_icon('edit.png', get_lang('Edit')),
+                    api_get_path(WEB_CODE_PATH).'mySpace/user_edit.php?user_id='.$student_id
+                );
+        }
+
+        $row[] = $lostPasswordLink.$detailsLink;
         $all_datas[] = $row;
     }
     return $all_datas;
diff --git a/main/mySpace/user_edit.php b/main/mySpace/user_edit.php
new file mode 100644
index 0000000000..1c2949af7a
--- /dev/null
+++ b/main/mySpace/user_edit.php
@@ -0,0 +1,219 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+// including necessary libraries
+$language_file = array('admin', 'registration');
+$cidReset = true;
+require_once '../inc/global.inc.php';
+$libpath = api_get_path(LIBRARY_PATH);
+require_once $libpath.'fileManage.lib.php';
+require_once $libpath.'fileUpload.lib.php';
+require_once $libpath.'mail.lib.inc.php';
+
+// user permissions
+api_block_anonymous_users();
+
+if (!api_is_platform_admin()) {
+    if (!api_is_drh()) {
+        api_not_allowed(true);
+    }
+} else {
+    api_protect_admin_script();
+}
+
+// Database table definitions
+$table_admin = Database:: get_main_table(TABLE_MAIN_ADMIN);
+$table_user = Database:: get_main_table(TABLE_MAIN_USER);
+$database = Database::get_main_database();
+
+$userId = isset($_REQUEST['user_id']) ? intval($_REQUEST['user_id']) : '';
+
+$userInfo = api_get_user_info($userId);
+if (empty($userInfo)) {
+    api_not_allowed(true);
+}
+
+$userIsFollowed = UserManager::is_user_followed_by_drh($userId, api_get_user_id());
+
+if (api_drh_can_access_all_session_content()) {
+    $students = SessionManager::getAllUsersFromCoursesFromAllSessionFromStatus(
+        'drh_all',
+        api_get_user_id(),
+        false,
+        0, //$from,
+        null, //$limit,
+        null, //$column,
+        'desc', //$direction,
+        null, //$keyword,
+        null, //$active,
+        null, //$lastConnectionDate,
+        null,
+        null,
+        STUDENT
+    );
+
+    if (empty($students)) {
+        api_not_allowed(true);
+    }
+    $userIdList = array();
+    foreach ($students as $student) {
+        $userIdList[] = $student['user_id'];
+    }
+
+    if (!in_array($userId, $userIdList)) {
+        api_not_allowed(true);
+    }
+} else {
+    if (!$userIsFollowed) {
+        api_not_allowed(true);
+    }
+}
+
+$url = api_get_self().'?user_id='.$userId;
+$tool_name = get_lang('ModifyUserInfo');
+// Create the form
+$form = new FormValidator('user_edit', 'post', $url);
+// Username
+$usernameInput = $form->addElement('text', 'username', get_lang('LoginName'));
+$usernameInput->freeze();
+
+// Password
+$group = array();
+$auth_sources = 0; //make available wider as we need it in case of form reset (see below)
+/*if (count($extAuthSource) > 0) {
+	$group[] =& $form->createElement('radio', 'password_auto', null, get_lang('ExternalAuthentication').' ', 2);
+	$auth_sources = array();
+	foreach ($extAuthSource as $key => $info) {
+		$auth_sources[$key] = $key;
+	}
+	$group[] =& $form->createElement('select', 'auth_source', null, $auth_sources);
+	$group[] =& $form->createElement('static', '', '', '<br />');
+}*/
+$group[] =& $form->createElement('radio', 'password_auto', get_lang('Password'), get_lang('AutoGeneratePassword').'<br />', 1);
+$group[] =& $form->createElement('radio', 'password_auto', 'id="radio_user_password"', null, 0);
+$group[] =& $form->createElement('password', 'password', null, array('onkeydown' => 'javascript: password_switch_radio_button(document.user_add,"password[password_auto]");'));
+$form->addGroup($group, 'password', get_lang('Password'), '');
+
+// Send email
+$group = array();
+$group[] =& $form->createElement('radio', 'send_mail', null, get_lang('Yes'), 1);
+$group[] =& $form->createElement('radio', 'send_mail', null, get_lang('No'), 0);
+$form->addGroup($group, 'mail', get_lang('SendMailToNewUser'), '&nbsp;');
+
+// Set default values
+$defaults = array();
+$defaults['username'] = $userInfo['username'];
+$defaults['mail']['send_mail'] = 0;
+$defaults['password']['password_auto'] = 1;
+
+$form->setDefaults($defaults);
+// Submit button
+$select_level = array ();
+$html_results_enabled[] = $form->createElement('style_submit_button', 'submit', get_lang('Update'));
+$form->addGroup($html_results_enabled);
+// Validate form
+if ($form->validate()) {
+	$check = Security::check_token('post');
+	if ($check) {
+		$user = $form->exportValues();
+		$email = $userInfo['email'];
+        $username = $userInfo['username'];
+		$send_mail = intval($user['mail']['send_mail']);
+        $auth_source = PLATFORM_AUTH_SOURCE;
+
+        $resetPassword = $user['password']['password_auto'] == '1' ? 0 : 2;
+
+		if (count($extAuthSource) > 0 && $user['password']['password_auto'] == '2') {
+			//$auth_source = $user['password']['auth_source'];
+			//$password = 'PLACEHOLDER';
+		} else {
+			//$auth_source = PLATFORM_AUTH_SOURCE;
+			//$password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
+		}
+
+        $auth_source = $userInfo['auth_source'];
+        $password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
+
+        UserManager::update_user(
+            $userId,
+            $userInfo['firstname'],
+            $userInfo['lastname'],
+            $userInfo['username'],
+            $password,
+            $auth_source,
+            $userInfo['email'],
+            $userInfo['status'],
+            $userInfo['official_code'],
+            $userInfo['phone'],
+            $userInfo['picture_uri'],
+            $userInfo['expiration_date'],
+            $userInfo['active'],
+            $userInfo['creator_id'],
+            $userInfo['hr_dept_id'],
+            null, //$extra =
+            $userInfo['language'],
+            null, //$encrypt_method
+            false,
+            $resetPassword
+        );
+
+		if (!empty($email) && $send_mail) {
+			$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
+			$portal_url = api_get_path(WEB_PATH);
+			if (api_is_multiple_url_enabled()) {
+				$access_url_id = api_get_current_access_url_id();
+				if ($access_url_id != -1) {
+					$url = api_get_access_url($access_url_id);
+					$portal_url = $url['url'];
+				}
+			}
+
+			$emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($userInfo['firstname'], $userInfo['lastname'])).",\n\n".
+                get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('WithTheFollowingSettings')."\n\n".
+                get_lang('Username')." : ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .
+                get_lang('Address') ." ". api_get_setting('siteName') ." ".
+                get_lang('Is') ." : ".$portal_url."\n\n".
+                get_lang('Problem'). "\n\n".
+                get_lang('SignatureFormula').",\n\n".
+                api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".
+                get_lang('Manager'). " ".
+                api_get_setting('siteName')."\nT. ".
+                api_get_setting('administratorTelephone')."\n" .
+                get_lang('Email') ." : ".api_get_setting('emailAdministrator');
+
+			api_mail_html(
+                api_get_person_name($userInfo['firstname'], $userInfo['lastname'], null, PERSON_NAME_EMAIL_ADDRESS),
+                $email,
+                $emailsubject,
+                $emailbody
+            );
+		}
+
+		Security::clear_token();
+        $tok = Security::get_token();
+        header('Location: '.$url.'&message=1');
+        exit();
+	}
+} else {
+	if (isset($_POST['submit'])) {
+		Security::clear_token();
+	}
+	$token = Security::get_token();
+	$form->addElement('hidden', 'sec_token');
+	$form->setConstants(array('sec_token' => $token));
+}
+
+$interbreadcrumb[] = array(
+    'url' => api_get_path(WEB_CODE_PATH)."mySpace/student.php",
+    "name" => get_lang('UserList'),
+);
+
+// Display form
+Display::display_header($tool_name);
+
+if (isset($_REQUEST['message'])) {
+	Display::display_normal_message(get_lang('Updated'));
+}
+$form->display();
+
+Display::display_footer();