diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index 69c56243e..49d5be2c6 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -213,6 +213,53 @@ else if ($action == "removefromprocesses") {
 	}
 }
 
+// transfer all objects from one user to another one
+else if ($action == "transferobjects") {
+
+	/* Check if the form data comes from a trusted request */
+	if(!checkFormKey('transferobjects')) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
+	}
+
+	if (isset($_POST["userid"])) {
+		$userid = $_POST["userid"];
+	}
+
+	if (!isset($userid) || !is_numeric($userid) || intval($userid)<1) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
+	}
+
+	/* Check if one  wants to transfer his/her own objects.
+	 */
+	if ($userid==$user->getID()) {
+		UI::exitError(getMLText("admin_tools"),getMLText("cannot_transfer_your_objects"));
+	}
+
+	$userToRemove = $dms->getUser($userid);
+	if (!is_object($userToRemove)) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
+	}
+
+	$userToAssign = $dms->getUser($_POST["assignTo"]);
+	if (!$userToRemove->remove($user, $userToAssign)) {
+		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	}
+		
+//	if(isset($_POST["status"]) && is_array($_POST["status"]) && $_POST["status"]) {
+		if (!$userToRemove->transferDocumentsFolders($userToAssign)) {
+			UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+		}
+
+		if (!$userToRemove->transferEvents($userToAssign)) {
+			UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+		}
+
+		add_log_line(".php&action=transferobjects&userid=".$userid);
+		
+		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_transfer_objects')));
+//	}
+}
+
 // modify user ------------------------------------------------------------
 else if ($action == "edituser") {
 
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index cc734a7fd..214479649 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -166,12 +166,25 @@ $(document).ready( function() {
 		$undeluserids = $this->params['undeluserids'];
 
 		if($seluser) {
+?>
+<div class="btn-group">
+  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+		<?php echo getMLText('action'); ?>
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+<?php
 			if(!in_array($seluser->getID(), $undeluserids)) {
-				echo '<a class="btn btn-danger" href="../out/out.RemoveUser.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user").'</a> ';
+				echo '<li><a href="../out/out.RemoveUser.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user").'</a><li>';
 			}
-			echo '<a class="btn btn-danger" href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user_from_processes").'</a> ';
+			echo '<li><a href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user_from_processes").'</a></li>';
+			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 "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\" class=\"btn btn-primary\"><i class=\"icon-exchange\"></i> ".getMLText("substitute_user")."</a>\n";
+				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";
+?>
+	</ul>
+</div>
+<?php
 		}
 	} /* }}} */