diff --git a/ui/src/app/login/login.controller.js b/ui/src/app/login/login.controller.js
index 8dcd2a9d8e..d749ea0936 100644
--- a/ui/src/app/login/login.controller.js
+++ b/ui/src/app/login/login.controller.js
@@ -20,7 +20,7 @@ import logoSvg from '../../svg/logo_title_white.svg';
 /* eslint-enable import/no-unresolved, import/default */
 
 /*@ngInject*/
-export default function LoginController(toast, loginService, userService, types, $state/*, $rootScope, $log, $translate*/) {
+export default function LoginController(toast, loginService, userService, types, $state, $stateParams/*, $rootScope, $log, $translate*/) {
     var vm = this;
 
     vm.logoSvg = logoSvg;
@@ -32,6 +32,12 @@ export default function LoginController(toast, loginService, userService, types,
 
     vm.login = login;
 
+    if ($stateParams.username && $stateParams.password) {
+        vm.user.name = $stateParams.username;
+        vm.user.password = $stateParams.password;
+        doLogin();
+    }
+
     function doLogin() {
         loginService.login(vm.user).then(function success(response) {
             var token = response.data.token;
diff --git a/ui/src/app/login/login.routes.js b/ui/src/app/login/login.routes.js
index ac9401147b..51121a782a 100644
--- a/ui/src/app/login/login.routes.js
+++ b/ui/src/app/login/login.routes.js
@@ -25,7 +25,7 @@ import createPasswordTemplate from './create-password.tpl.html';
 /*@ngInject*/
 export default function LoginRoutes($stateProvider) {
     $stateProvider.state('login', {
-        url: '/login',
+        url: '/login?username&password',
         module: 'public',
         views: {
             "@": {