diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index 042afec136..163a9a27ce 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -2024,4 +2024,25 @@ $text['button-add_member']['ru-ru'] = "Добавить участника";
 $text['button-add_member']['sv-se'] = "Lägg Till Medlem";
 $text['button-add_member']['uk-ua'] = "Додати учасника";
 
-?>
+$text['button-permissions']['en-us'] = "Permissions";
+$text['button-permissions']['en-gb'] = "Permissions";
+$text['button-permissions']['ar-eg'] = "";
+$text['button-permissions']['de-at'] = "Berechtigungen"; //copied from de-de
+$text['button-permissions']['de-ch'] = "Berechtigungen"; //copied from de-de
+$text['button-permissions']['de-de'] = "Berechtigungen";
+$text['button-permissions']['es-cl'] = "Permisos";
+$text['button-permissions']['es-mx'] = "Permisos"; //copied from es-cl
+$text['button-permissions']['fr-ca'] = "Permissions"; //copied from fr-fr
+$text['button-permissions']['fr-fr'] = "Permissions";
+$text['button-permissions']['he-il'] = "הרשאות";
+$text['button-permissions']['it-it'] = "Permessi";
+$text['button-permissions']['nl-nl'] = "";
+$text['button-permissions']['pl-pl'] = "Uprawnienia";
+$text['button-permissions']['pt-br'] = "Permissões"; //copied from pt-pt
+$text['button-permissions']['pt-pt'] = "Permissões";
+$text['button-permissions']['ro-ro'] = "";
+$text['button-permissions']['ru-ru'] = "Права";
+$text['button-permissions']['sv-se'] = "Rättigheter";
+$text['button-permissions']['uk-ua'] = "Привілеї";
+
+?>
\ No newline at end of file
diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index 5001e2464f..98f3df7344 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -670,12 +670,18 @@
 		echo "<div class='unsaved'>".$text['message-unsaved_changes']." <i class='fas fa-exclamation-triangle'></i></div>";
 	}
 	if (permission_exists('user_add') || permission_exists('user_edit')) {
-		echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','style'=>'margin-right: 15px;','link'=>'users.php']);
+		echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'users.php']);
 	}
+	$button_margin = 'margin-left: 15px;';
 	if (permission_exists('ticket_add') || permission_exists('ticket_edit')) {
-		echo button::create(['type'=>'button','label'=>$text['button-tickets'],'icon'=>'tags','style'=>'margin-right: 15px;','link'=>PROJECT_PATH.'/app/tickets/tickets.php?user_uuid='.urlencode($user_uuid)]);
+		echo button::create(['type'=>'button','label'=>$text['button-tickets'],'icon'=>'tags','style'=>$button_margin,'link'=>PROJECT_PATH.'/app/tickets/tickets.php?user_uuid='.urlencode($user_uuid)]);
+		unset($button_margin);
 	}
-	echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','onclick'=>'submit_form();']);
+	if (permission_exists('user_permissions') && file_exists('../../app/user_permissions/user_permissions.php')) {
+		echo button::create(['type'=>'button','label'=>$text['button-permissions'],'icon'=>'key','style'=>$button_margin,'link'=>PROJECT_PATH.'/app/user_permissions/user_permissions.php?id='.urlencode($user_uuid)]);
+		unset($button_margin);
+	}
+	echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','style'=>'margin-left: 15px;','onclick'=>'submit_form();']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
diff --git a/resources/footer.php b/resources/footer.php
index d97013c398..0b94f30fe6 100644
--- a/resources/footer.php
+++ b/resources/footer.php
@@ -251,6 +251,15 @@
 		$view->assign('login_page', $login_page);
 	//messages
 		$view->assign('messages', message::html(true, '		'));
+	//session timer
+		if (
+			$authenticated &&
+			file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH.'/app/session_timer/session_timer.php') &&
+			$_SESSION['security']['session_timer_enabled']['boolean'] == 'true'
+			) {
+			include_once PROJECT_PATH.'app/session_timer/session_timer.php';
+			$view->assign('session_timer', $session_timer);
+		}
 
 	//render the view
 		$output = $view->render('template.php');
diff --git a/themes/default/template.php b/themes/default/template.php
index 8f9f0ee07c..1eeb910705 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -802,6 +802,9 @@
 		});
 		{/literal}
 
+	{*//session timer *}
+		{$session_timer}
+
 	</script>
 
 </head>