diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index 572724f41..fd445d1c7 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js
@@ -441,8 +441,8 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         // Re-authenticate to verify auth status at end of connection
         authenticationService.updateCurrentToken($location.search())
 
-        // If authentication is OK, show the requested status
-        .then(function authenticationCheckSuccessful() {
+        // Show the requested status once the authentication check has finished
+        ['finally'](function authenticationCheckComplete() {
             guacNotification.showStatus(status);
         });