diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index eeb45a84..b296d286 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -474,12 +474,15 @@ ChangeEmailDirective = ($repo, $model, $auth, $confirm, $location, $params, $nav
         form = $el.find("form").checksley()
 
         onSuccessSubmit = (response) ->
-            $repo.queryOne("users", $auth.getUser().id).then (data) =>
-                $auth.setUser(data)
-                $location.path($navUrls.resolve("home"))
+            if $auth.isAuthenticated()
+                $repo.queryOne("users", $auth.getUser().id).then (data) =>
+                    $auth.setUser(data)
+                    $location.path($navUrls.resolve("home"))
+            else
+                $location.path($navUrls.resolve("login"))
 
-                text = $translate.instant("CHANGE_EMAIL_FORM.SUCCESS")
-                $confirm.success(text)
+            text = $translate.instant("CHANGE_EMAIL_FORM.SUCCESS")
+            $confirm.success(text)
 
         onErrorSubmit = (response) ->
             text = $translate.instant("COMMON.GENERIC_ERROR", {error: response.data._error_message})