diff --git a/app/assets/javascripts/app/controllers/reset_password.js.coffee b/app/assets/javascripts/app/controllers/reset_password.js.coffee
index 7c1d352cf..feb034074 100644
--- a/app/assets/javascripts/app/controllers/reset_password.js.coffee
+++ b/app/assets/javascripts/app/controllers/reset_password.js.coffee
@@ -12,6 +12,11 @@ class Index extends App.ControllerContent
       @navigate '#'
       return
 
+    # if we are logged in, no passwort reset is wanted, redirect to app
+    if @authenticate(true)
+      @navigate '#'
+      return
+
     @navHide()
 
     # set title
@@ -80,6 +85,11 @@ class Verify extends App.ControllerContent
   constructor: ->
     super
 
+    # if we are logged in, no passwort reset is wanted, redirect to app
+    if @authenticate(true)
+      @navigate '#'
+      return
+
     @navHide()
 
     # set title
diff --git a/test/browser/signup_password_change_and_reset_test.rb b/test/browser/signup_password_change_and_reset_test.rb
index 1979beb28..caaf30668 100644
--- a/test/browser/signup_password_change_and_reset_test.rb
+++ b/test/browser/signup_password_change_and_reset_test.rb
@@ -204,7 +204,7 @@ class SignupPasswordChangeAndResetTest < TestCase
         ],
       },
       {
-        :name     => 'reset password',
+        :name     => 'reset password (not possible)',
         :action   => [
           # got to wrong url
           {
@@ -216,8 +216,38 @@ class SignupPasswordChangeAndResetTest < TestCase
             :area    => 'body',
             :value   => 'Token is invalid',
           },
-
-          # correct way
+          # with valid session
+          {
+            :execute => 'navigate',
+            :to      => browser_url + '/#',
+          },
+          {
+            :execute  => 'login',
+            :username => signup_user_email,
+            :password => 'some-pass-new2',
+          },
+          {
+            :execute => 'navigate',
+            :to      => browser_url + '/#reset_password',
+          },
+          {
+            :execute => 'wait',
+            :value   => 1,
+          },
+          {
+            :execute      => 'match',
+            :css          => 'body',
+            :value        => 'password',
+            :match_result => false,
+          },
+          {
+            :execute  => 'logout',
+          },
+        ],
+      },
+      {
+        :name     => 'reset password (correct way)',
+        :action   => [
           {
             :execute => 'click',
             :css     => 'a[href="#reset_password"]',