diff --git a/lib/public/user.php b/lib/public/user.php
index 9e50115ab7053e7a4eb13d9615ad9296b5665761..e297b716dc2360ee7635add7a03f7ab878476c99 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -73,12 +73,10 @@ class User {
 	}
 	/**
 	 * @brief Loggs the user out including all the session data
-	 * @returns true
-	 *
 	 * Logout, destroys session
 	 */
 	public static function logout() {
-		return \OC_USER::logout();
+		\OC_USER::logout();
 	}
 
 	/**
diff --git a/lib/user.php b/lib/user.php
index 8d4eb7aec4d29b82cfad8788f0fa517a175d188c..fd0ed6ecd3ac5091685ec739ca7b164dc4774718 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -260,17 +260,13 @@ class OC_User {
 
 	/**
 	 * @brief Sets user id for session and triggers emit
-	 * @returns true
-	 *
 	 */
 	public static function setUserId($uid) {
 		$_SESSION['user_id'] = $uid;
-		return true;
 	}
 
 	/**
 	 * @brief Logs the current user out and kills all the session data
-	 * @returns true
 	 *
 	 * Logout, destroys session
 	 */
@@ -279,7 +275,6 @@ class OC_User {
 		session_unset();
 		session_destroy();
 		OC_User::unsetMagicInCookie();
-		return true;
 	}
 
 	/**