diff --git a/lib/Horde/Core/Auth/Application.php b/lib/Horde/Core/Auth/Application.php
index 17aef637d..c32a5a6f4 100644
--- a/lib/Horde/Core/Auth/Application.php
+++ b/lib/Horde/Core/Auth/Application.php
@@ -666,17 +666,17 @@ protected function _setAuth()
             return false;
         }
 
+        /* Only set the view mode on initial authentication */
+        if (!$GLOBALS['session']->exists('horde', 'view')) {
+            $this->_setView();
+        }
+
         $registry->setAuth($userId, $credentials, array(
             'app' => $this->_app,
             'change' => $this->getCredential('change'),
             'language' => $language
         ));
 
-        /* Only set the view mode on initial authentication */
-        if (!$GLOBALS['session']->exists('horde', 'view')) {
-            $this->_setView();
-        }
-
         if ($this->_base &&
             isset($GLOBALS['notification']) &&
             ($expire = $this->_base->getCredential('expire'))) {