diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index ad8b79dd2..b9e68ebf9 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -265,7 +265,7 @@ else if ($action == "transferobjects") {
 }
 
 // send login data to user
-else if ($action == "sendlogindata") {
+else if ($action == "sendlogindata" && $settings->_enableEmail) {
 	/* Check if the form data comes from a trusted request */
 	if(!checkFormKey('sendlogindata')) {
 		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
diff --git a/out/out.UsrMgr.php b/out/out.UsrMgr.php
index fde4b7c41..27fdeae53 100644
--- a/out/out.UsrMgr.php
+++ b/out/out.UsrMgr.php
@@ -49,7 +49,7 @@ if(isset($_GET['userid']) && $_GET['userid']) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota, 'strictformcheck'=>$settings->_strictFormCheck));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota, 'strictformcheck'=>$settings->_strictFormCheck, 'enableemail'=>$settings->_enableEmail));
 if($view) {
 	$view($_GET);
 }
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index a899ccc66..328d6d1dc 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -168,6 +168,7 @@ $(document).ready( function() {
 		$quota = $this->params['quota'];
 		$workflowmode = $this->params['workflowmode'];
 		$undeluserids = $this->params['undeluserids'];
+		$enableemail = $this->params['enableemail'];
 
 		if($seluser) {
 ?>
@@ -185,7 +186,8 @@ $(document).ready( function() {
 			echo '<li><a href="../out/out.TransferObjects.php?userid='.$seluser->getID().'"><i class="icon-share-alt"></i> '.getMLText("transfer_objects").'</a></li>';
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
 				echo "<li><a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText("substitute_user")."</a></li>\n";
-			echo '<li><a href="../out/out.SendLoginData.php?userid='.$seluser->getID().'"><i class="icon-envelope-alt"></i> '.getMLText("send_login_data").'</a></li>';
+			if($enableemail)
+				echo '<li><a href="../out/out.SendLoginData.php?userid='.$seluser->getID().'"><i class="icon-envelope-alt"></i> '.getMLText("send_login_data").'</a></li>';
 ?>
 	</ul>
 </div>