diff --git a/src/js/login.js b/src/js/login.js
index b4c15de40..68de4c044 100644
--- a/src/js/login.js
+++ b/src/js/login.js
@@ -183,7 +183,14 @@ app.controller('LoginController', ['$scope', '$translate', '$http', function ($s
     });
 
     // Init into the correct view
-    if (search.passwordReset) $scope.showPasswordReset();
-    else if (search.resetToken) $scope.showNewPassword();
-    else $scope.showLogin();
+    if (search.passwordReset) {
+        $scope.showPasswordReset();
+    } else if (search.resetToken) {
+        $scope.showNewPassword();
+    } else if (search.accessToken || search.access_token) { // auto-login feature
+        localStorage.token = search.accessToken || search.access_token;
+        window.location.href = '/';
+    } else {
+        $scope.showLogin();
+    }
 }]);