diff --git a/client/entry.coffee b/client/entry.coffee
index 2efa7c0d..e89ed829 100644
--- a/client/entry.coffee
+++ b/client/entry.coffee
@@ -30,13 +30,12 @@ AccountsEntry =
   signInRequired: (router, extraCondition) ->
     extraCondition ?= true
     unless Meteor.loggingIn()
-      if Meteor.user() and extraCondition
-        router.next()
-      else
+      if not (Meteor.user() and extraCondition)
         Session.set('fromWhere', router.url)
         Router.go('/sign-in')
         Session.set('entryError', t9n('error.signInRequired'))
-        router.next()
+    router.next()
+
 
 @AccountsEntry = AccountsEntry
 
diff --git a/client/entry.less b/client/entry.less
index fe0dbd7a..d4e7a621 100644
--- a/client/entry.less
+++ b/client/entry.less
@@ -82,15 +82,6 @@
       }
     }
 
-    &#entry-google {
-      background: #db5a3c;
-      color: #fff;
-
-      &:hover {
-        background: #CA4C2E;
-      }
-    }
-
     &#entry-github {
       background: #666;
       color: #fff;
@@ -100,6 +91,11 @@
       }
     }
   }
+
+  a {
+    display: block;
+    margin: auto;
+  }
 }
 
 .email-option {
diff --git a/client/helpers.coffee b/client/helpers.coffee
index 3b4f8612..6de978db 100644
--- a/client/helpers.coffee
+++ b/client/helpers.coffee
@@ -28,7 +28,7 @@ UI.registerHelper 'otherLoginServices', ->
   Accounts.oauth.serviceNames().length > 0
 
 UI.registerHelper 'loginServices', ->
-  Accounts.oauth.serviceNames()
+  ["google", "dropbox", "box", "onedrive"]
 
 UI.registerHelper 'showSignupCode', ->
   AccountsEntry.settings.showSignupCode is true
@@ -50,9 +50,12 @@ UI.registerHelper 'containerCSSClass', ->
       "container-fluid"
     else
       "container"
-    
+
 UI.registerHelper 'rowCSSClass', ->
   if AccountsEntry.settings.fluidLayout is true
     "row-fluid"
   else
-    "row"
\ No newline at end of file
+    "row"
+
+UI.registerHelper 'isPrimaryService', (serviceName)->
+  serviceName is 'google' or serviceName is 'dropbox'
diff --git a/client/t9n/english.coffee b/client/t9n/english.coffee
index 6181f772..282d54e8 100644
--- a/client/t9n/english.coffee
+++ b/client/t9n/english.coffee
@@ -30,7 +30,7 @@ en =
   "User not found":  "User not found"
 
   error:
-    minChar: "7 character minimum password."
+    minChar: "6 character minimum password."
     pwOneLetter: "Password requires 1 letter."
     pwOneDigit: "Password must have at least one digit."
     usernameRequired: "Username is required."
diff --git a/client/views/forgotPassword/forgotPassword.html b/client/views/forgotPassword/forgotPassword.html
index 63be3048..eb96f112 100644
--- a/client/views/forgotPassword/forgotPassword.html
+++ b/client/views/forgotPassword/forgotPassword.html
@@ -1,25 +1,35 @@
 <template name='entryForgotPassword'>
-  <div class="{{containerCSSClass}}">
-    <div class="{{rowCSSClass}}">
-      {{#if logo}}
-        <div class="entry-logo">
-            <a href="/"><img src="{{logo}}" alt="logo"></a>
-        </div>
-      {{/if}}
-      <div class="entry col-md-4 col-md-offset-4">
-        {{#if error}}
-          <div class='alert alert-danger'>{{error}}</div>
-        {{/if}}
-        <h3>{{t9n 'forgotPassword'}}</h3>
-        <form id='forgotPassword'>
-          <div class="form-group">
-            <input type="email" name="forgottenEmail" class="form-control" placeholder="{{t9n 'emailAddress'}}" value=''>
+  <div class="sign-in-page forgot-password-page">
+    <div class="{{containerCSSClass}}">
+      <div class="{{rowCSSClass}}">
+        {{#if logo}}
+          <div class="entry-logo">
+              <a href="/"><img src="{{logo}}" alt="logo"></a>
           </div>
-          <button type="submit" class="btn btn-default">{{t9n 'emailResetLink'}}</button>
-        </form>
-        {{#if showSignupCode}}
-          <p class="entry-signup-cta">{{t9n 'dontHaveAnAccount'}} <a href="{{pathFor 'entrySignUp'}}">{{t9n 'signUp'}}</a></p>
         {{/if}}
+        <div class="col-md-12">
+          <div class="header-signin">
+            <h1>forgot password</h1>
+            <p>put your email address you registered with lumin, we will send an email with a link to recover your password</p>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="entry col-md-offset-3 col-md-6">
+          {{#if error}}
+            <div class='alert alert-danger'>{{error}}</div>
+          {{/if}}
+          <form class="entry-form" id='forgotPassword'>
+            <div class="form-group">
+              <label>Your email address:</label>
+              <input type="email" name="forgottenEmail" class="form-control" value=''>
+            </div>
+            <button type="submit" class="submit btn btn-default">send reset link</button>
+          </form>
+          {{#if showSignupCode}}
+            <p class="entry-signup-cta">{{t9n 'dontHaveAnAccount'}} <a href="{{pathFor 'entrySignUp'}}">{{t9n 'signUp'}}</a></p>
+          {{/if}}
+        </div>
       </div>
     </div>
   </div>
diff --git a/client/views/resetPassword/resetPassword.coffee b/client/views/resetPassword/resetPassword.coffee
index d957dfd2..00053cdf 100644
--- a/client/views/resetPassword/resetPassword.coffee
+++ b/client/views/resetPassword/resetPassword.coffee
@@ -8,17 +8,17 @@ Template.entryResetPassword.events
 
   'submit #resetPassword': (event) ->
     event.preventDefault()
-    password = $('input[type="password"]').val()
+    password = $('input[name="new-password"]').val()
 
     passwordErrors = do (password)->
       errMsg = []
       msg = false
-      if password.length < 7
+      if password.length < 6
         errMsg.push t9n("error.minChar")
-      if password.search(/[a-z]/i) < 0
-        errMsg.push t9n("error.pwOneLetter")
-      if password.search(/[0-9]/) < 0
-        errMsg.push t9n("error.pwOneDigit")
+      # if password.search(/[a-z]/i) < 0
+      #   errMsg.push t9n("error.pwOneLetter")
+      # if password.search(/[0-9]/) < 0
+      #   errMsg.push t9n("error.pwOneDigit")
 
       if errMsg.length > 0
         msg = ""
@@ -34,7 +34,7 @@ Template.entryResetPassword.events
 
     Accounts.resetPassword Session.get('resetToken'), password, (error) ->
       if error
-        Session.set('entryError', (error.reason || "Unknown error"))
+        Session.set 'entryError', (error.reason || "Unknown error")
       else
-        Session.set('resetToken', null)
-        Router.go AccountsEntry.settings.dashboardRoute
+        Session.set 'resetToken', null
+        Router.go AccountsEntry.settings.dashboardRoute
\ No newline at end of file
diff --git a/client/views/resetPassword/resetPassword.html b/client/views/resetPassword/resetPassword.html
index adde8e3a..8d6bff65 100644
--- a/client/views/resetPassword/resetPassword.html
+++ b/client/views/resetPassword/resetPassword.html
@@ -6,16 +6,17 @@
             <a href="/"><img src="{{logo}}" alt="logo"></a>
         </div>
       {{/if}}
-      <div class="entry col-md-4 col-md-offset-4">
+      <div class="entry-form col-md-4 col-md-offset-4 sign-in-page reset-password">
         {{#if error}}
           <div class='alert alert-danger'>{{error}}</div>
         {{/if}}
         <h3>{{t9n "resetYourPassword"}}</h3>
-        <form id='resetPassword'>
+        <form id='resetPassword' class='entry-form'>
           <div class="form-group">
+                <label>Password:</label>
             <input type="password" name="new-password" class="form-control" value=''>
           </div>
-          <button type="submit" class="btn btn-default">{{t9n "updateYourPassword"}}</button>
+          <button type="submit" class="submit btn btn-default" style="width: 83% !important;">{{t9n "updateYourPassword"}}</button>
         </form>
         {{#if showSignupCode}}
           <p class="entry-signup-cta">{{t9n 'dontHaveAnAccount'}} <a href="{{pathFor 'entrySignUp'}}">{{t9n 'signUp'}}</a></p>
diff --git a/client/views/signIn/signIn.html b/client/views/signIn/signIn.html
index 8b72eec0..2841a846 100644
--- a/client/views/signIn/signIn.html
+++ b/client/views/signIn/signIn.html
@@ -1,47 +1,70 @@
 <template name='entrySignIn'>
-  <div class="{{containerCSSClass}}">
-    <div class="{{rowCSSClass}}">
-      {{#if logo}}
-        <div class="entry-logo">
-            <a href="/"><img src="{{logo}}" alt="logo"></a>
-        </div>
-      {{/if}}
-      <div class="entry col-md-4 col-md-offset-4">
-        {{#if otherLoginServices}}
-        <div class="entry-social">
-          {{#each loginServices}}
-            {{> entrySocial}}
-          {{/each}}
-          {{#if passwordLoginService}}
-          <div class="email-option">
-            <strong class="line-thru or-sign-in">{{t9n "OR"}}</strong>
+  <div class="sign-in-page">
+    <div class="{{containerCSSClass}}">
+      <div class="{{rowCSSClass}}">
+        {{#if logo}}
+          <div class="entry-logo">
+              <a href="/"><img src="{{logo}}" alt="logo"></a>
           </div>
-          {{/if}}
-        </div>
         {{/if}}
-        {{> entryError}}
-        {{#unless otherLoginServices}}
-          <div class="email-option">
-            <h3>{{t9n "signIn"}}</h3>
+        <div class="col-md-12">
+          <div class="header-signin">
+            <h1>Login</h1>
+            <p>Just take 1 min to get all lumin features</p>
           </div>
-        {{/unless}}
-        {{#if passwordLoginService}}
-          <form class="entry-form" id='signIn'>
-            <div class="form-group">
-              <input autofocus name="email" type="{{emailInputType}}" class="form-control" value='{{email}}' placeholder="{{emailPlaceholder}}" autocapitalize="none" autocomplete="off" autocorrect="off">
-            </div>
-            <div class="form-group">
-              <input name="password" type="password" class="form-control" value='{{password}}' placeholder="{{t9n 'password'}}">
-            </div>
-            {{#unless isUsernameOnly}}
-              <p><a href="{{pathFor 'entryForgotPassword'}}">{{t9n "forgotPassword"}}</a></p>
-              <button type="submit" class="submit btn btn-block btn-default">{{t9n "signIn"}}</button>
+        </div>
+        <div class="entry col-md-12">
+          <div class="row">
+            {{#if passwordLoginService}}
+              <div class="col-md-6">
+                <form class="entry-form" id='signIn'>
+                  <h3>With your email:</h3>
+                   {{> entryError}}
+                  <div class="form-group">
+                    <label>Your email address:</label>
+                    <input autofocus name="email" type="{{emailInputType}}" class="form-control" value='{{email}}' autocapitalize="none" autocomplete="off" autocorrect="off">
+                  </div>
+                  <div class="form-group">
+                    <label>Password:</label>
+                    <input name="password" type="password" class="form-control" value='{{password}}'>
+                  </div>
+                  {{#unless isUsernameOnly}}
+                  <div class="row">
+                    <div class="col-md-4">
+                      <button type="submit" class="submit btn btn-block btn-default">
+                      <i class="icon-try"></i>
+                      <span>log me in</span>
+                      </button>
+                    </div>
+                    <div class="col-md-8">
+                      <div class="forgot">
+                        <a href="{{pathFor 'entryForgotPassword'}}"><i class="icon-right"></i><span>Forgot ID/PW?</span></a>
+                        {{#if showCreateAccountLink}}
+                        <a href="{{pathFor 'entrySignUp'}}"><i class="icon-right"></i><span>Register new account</span></a>
+                        {{/if}}
+                      </div>
+                    </div> 
+                  </div>
+                  {{/unless}}
+                </form>
+              </div>
+            {{/if}}
+
+            {{#if otherLoginServices}}
+              <div class="entry-social col-md-6">
+                <h3>Log in with:</h3>
+                {{#each loginServices}}
+                  {{> entrySocial}}
+                {{/each}}  
+              </div>
+            {{/if}}
+            {{#unless otherLoginServices}}
+              <div class="email-option">
+                <h3>{{t9n "signIn"}}</h3>
+              </div>
             {{/unless}}
-          </form>
-        {{/if}}
-        {{#if showCreateAccountLink}}
-        <p class="entry-signup-cta">{{t9n "dontHaveAnAccount"}} <a href="{{pathFor 'entrySignUp'}}">{{t9n "signUp"}}</a></p>
-        {{/if}}
+            </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/client/views/signUp/extraSignUpFields.html b/client/views/signUp/extraSignUpFields.html
index fdd5275a..7820974e 100644
--- a/client/views/signUp/extraSignUpFields.html
+++ b/client/views/signUp/extraSignUpFields.html
@@ -6,8 +6,9 @@
 
 <template name="_entryExtraSignUpField">
     {{#if isTextField }}
-    <div class="form-group">
-        {{text_field field type=type required=required label=label placeholder=placeholder }}
+    <div class="form-group your-name">
+        <label>Your name:</label>
+        {{text_field field type=type required=required}}
     </div>
     {{/if}}
 
diff --git a/client/views/signUp/signUp.coffee b/client/views/signUp/signUp.coffee
index 8eb32bc8..e14aef31 100644
--- a/client/views/signUp/signUp.coffee
+++ b/client/views/signUp/signUp.coffee
@@ -83,15 +83,31 @@ AccountsEntry.entrySignUpEvents = {
     fields = AccountsEntry.settings.passwordSignupFields
 
 
+#    passwordErrors = do (password)->
+#      errMsg = []
+#      msg = false
+#      if password.length < 7
+#        errMsg.push t9n("error.minChar")
+#      if password.search(/[a-z]/i) < 0
+#        errMsg.push t9n("error.pwOneLetter")
+#      if password.search(/[0-9]/) < 0
+#        errMsg.push t9n("error.pwOneDigit")
+#
+#      if errMsg.length > 0
+#        msg = ""
+#        errMsg.forEach (e) ->
+#          msg = msg.concat "#{e}\r\n"
+#
+#        Session.set 'entryError', msg
+#        return true
+#
+#      return false
+
     passwordErrors = do (password)->
       errMsg = []
       msg = false
-      if password.length < 7
+      if password.length < 6
         errMsg.push t9n("error.minChar")
-      if password.search(/[a-z]/i) < 0
-        errMsg.push t9n("error.pwOneLetter")
-      if password.search(/[0-9]/) < 0
-        errMsg.push t9n("error.pwOneDigit")
 
       if errMsg.length > 0
         msg = ""
diff --git a/client/views/signUp/signUp.html b/client/views/signUp/signUp.html
index 270e101a..186c4ae2 100644
--- a/client/views/signUp/signUp.html
+++ b/client/views/signUp/signUp.html
@@ -1,81 +1,104 @@
 <template name='entrySignUp'>
-  <div class="{{containerCSSClass}}">
-    <div class="{{rowCSSClass}}">
-      {{#if logo}}
-        <div class="entry-logo">
-            <a href="/"><img src="{{logo}}" alt="logo"></a>
-        </div>
-      {{/if}}
-      <div class="entry col-md-4 col-md-offset-4">
-        <h3>{{t9n "createAccount"}}</h3>
-        {{#if otherLoginServices}}
-          <p class="entry-signin-cta">{{t9n "ifYouAlreadyHaveAnAccount"}} <a href="{{pathFor 'entrySignIn'}}">{{t9n "signin"}}</a>.</p>
-          <div class="entry-social">
-            {{#each loginServices}}
-              {{> entrySocial}}
-            {{/each}}
-            {{#if passwordLoginService}}
-              <div class="email-option">
-                <strong class="line-thru">{{t9n "OR"}}</strong>
-                <a data-toggle="collapse" href="#signUp">
-                  {{t9n "signUpWithYourEmailAddress"}}
-                </a>
-              </div>
-            {{/if}}
+  <div class="sign-in-page sign-up-page">
+    <div class="{{containerCSSClass}}">
+      <div class="{{rowCSSClass}}">
+        {{#if logo}}
+          <div class="entry-logo">
+              <a href="/"><img src="{{logo}}" alt="logo"></a>
           </div>
-        {{else}}
-            <p class="entry-signin-cta">{{t9n "ifYouAlreadyHaveAnAccount"}} <a href="{{pathFor 'entrySignIn'}}">{{t9n "signin"}}</a>.</p>
         {{/if}}
-        {{> entryError}}
-        {{#if passwordLoginService}}
-          <form class="entry-form {{signupClass}}" id='signUp'>
-            {{#if showUsername}}
-              <div class="form-group">
-                <label>{{t9n "username"}}</label>
-                <input autofocus name="username" type="string" class="form-control" value=''  autocapitalize="none" autocomplete="off" autocorrect="off">
-              </div>
-            {{/if}}
-
-            {{#if showEmail}}
-              <div class="form-group">
-                <label>{{t9n "emailAddress"}}</label>
+          <div class="col-md-12">
+            <div class="header-signin">
+              <h1>Register</h1>
+              <p>just take 1 min to get all features of lumin</p>
+            </div>
+          </div>
+        <div class="entry col-md-12">
+          <div class="row">
+            <div class="col-md-6">
+              {{#if passwordLoginService}}
+              <h3>By your email:</h3>
+              {{> entryError}}
+              <form class="entry-form" id='signUp'>
+                {{> entryExtraSignUpFields}}
                 {{#if showUsername}}
-                  <input type="email" class="form-control" value='{{emailAddress}}'  autocapitalize="none" autocomplete="off" autocorrect="off">
-                {{else}}
-                  <input autofocus type="email" class="form-control" value='{{emailAddress}}'  autocapitalize="none" autocomplete="off" autocorrect="off" >
+                  <div class="form-group">
+                    <label>{{t9n "username"}}</label>
+                    <input autofocus name="username" type="string" class="form-control" value=''  autocapitalize="none" autocomplete="off" autocorrect="off">
+                  </div>
+                {{/if}}
+                {{#if showEmail}}
+                  <div class="form-group">
+                    <label>Your email address:</label>
+                    {{#if showUsername}}
+                      <input type="email" class="form-control" value='{{emailAddress}}'  autocapitalize="none" autocomplete="off" autocorrect="off">
+                    {{else}}
+                      <input autofocus type="email" class="form-control" value='{{emailAddress}}'  autocapitalize="none" autocomplete="off" autocorrect="off" >
+                    {{/if}}
+                  </div>
                 {{/if}}
-              </div>
-            {{/if}}
 
-            <div class="form-group">
-              <label>{{t9n "password"}}</label>
-              <input type="password" class="form-control" value=''>
-            </div>
+                <div class="form-group">
+                  <label>Password:</label>
+                  <input type="password" class="form-control" value=''>
+                </div>
 
-            {{#if showSignupCode}}
-              <div class="form-group">
-                <label>{{t9n "signupCode"}}</label>
-                <input name="signupCode" type="string" class="form-control" value=''  autocapitalize="none" autocomplete="off" autocorrect="off" >
-              </div>
+                {{#if showSignupCode}}
+                  <div class="form-group">
+                    <label>{{t9n "signupCode"}}</label>
+                    <input name="signupCode" type="string" class="form-control" value=''  autocapitalize="none" autocomplete="off" autocorrect="off" >
+                  </div>
+                {{/if}}
+                <div class="row">
+                  <div class="col-md-4">
+                    <button type="submit" class="submit btn btn-block btn-default">Register</button>
+                  </div>
+                  <div class="col-md-8">
+                    <i class="icon-right"></i>
+                    <div class="forgot">
+                      <p class="entry-signin-cta">Already have account?</p>
+                      <a href="{{pathFor 'entrySignIn'}}">Login here</a>
+                    </div>
+                  </div>
+                </div>
+              </form>
+            {{/if}}
+            </div>
+            <div class="col-md-6 entry-social">
+              {{#if otherLoginServices}}
+              <h3>Register with:</h3>
+              <p class="entry-signin-cta" style="display:none">{{t9n "ifYouAlreadyHaveAnAccount"}} <a href="{{pathFor 'entrySignIn'}}">{{t9n "signin"}}</a>.</p>
+              {{#each loginServices}}
+                {{> entrySocial}}
+              {{/each}}
+              {{#if passwordLoginService}}
+                <div class="email-option">
+                  <!-- <strong class="line-thru">{{t9n "OR"}}</strong> -->
+                  <!-- <a data-toggle="collapse" href="#signUp">
+                    {{t9n "signUpWithYourEmailAddress"}}
+                  </a> -->
+                </div>
+              {{/if}}
+            {{else}}
+                <p class="entry-signin-cta" style="display:none">{{t9n "ifYouAlreadyHaveAnAccount"}} <a href="{{pathFor 'entrySignIn'}}">{{t9n "signin"}}</a>.</p>
             {{/if}}
 
-            {{> entryExtraSignUpFields}}
-            <button type="submit" class="submit btn btn-block btn-default">{{t9n "signUp"}}</button>
-          </form>
-        {{/if}}
-        {{#if both}}
-          <p class="entry-agreement">{{t9n "clickAgree"}}
-            <a href="{{privacyUrl}}">{{t9n "privacyPolicy"}}</a> {{t9n "and"}}
-            <a href="{{termsUrl}}">{{t9n "terms"}}</a>.
-          </p>
-        {{else}}
-          {{#unless neither}}
-            <p class="entry-agreement">{{t9n "clickAgree"}}
-              {{#if privacyUrl}}<a href="{{privacyUrl}}">{{t9n "privacyPolicy"}}</a>.{{/if}}
-              {{#if termsUrl}}<a href="{{termsUrl}}">{{t9n "terms"}}</a>.{{/if}}
-            </p>
-          {{/unless}}
-        {{/if}}
+            {{#if both}}
+              <p class="entry-agreement">{{t9n "clickAgree"}}
+                <a href="{{privacyUrl}}">{{t9n "privacyPolicy"}}</a> {{t9n "and"}}
+                <a href="{{termsUrl}}">{{t9n "terms"}}</a>.
+              </p>
+            {{else}}
+              {{#unless neither}}
+                <p class="entry-agreement">{{t9n "clickAgree"}}
+                  {{#if privacyUrl}}<a href="{{privacyUrl}}">{{t9n "privacyPolicy"}}</a>.{{/if}}
+                  {{#if termsUrl}}<a href="{{termsUrl}}">{{t9n "terms"}}</a>.{{/if}}
+                </p>
+              {{/unless}}
+            {{/if}}
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/client/views/social/social.html b/client/views/social/social.html
index f3732887..5d0b22e8 100644
--- a/client/views/social/social.html
+++ b/client/views/social/social.html
@@ -1,9 +1,9 @@
 <template name='entrySocial'>
-  <button class="btn" id="entry-{{this}}" name="{{this}}">
-    {{#if unconfigured}}
-      <i class="fa fa-{{icon}}"></i> {{t9n "configure"}} {{capitalize this}}
-    {{else}}
-      <i class="fa fa-{{icon}}"></i> {{buttonText}} {{t9n "with"}} {{capitalize this}}
-    {{/if}}
-  </button>
+  {{#if isPrimaryService this}}
+    <button class="btn icon-{{this}}" id="entry-{{this}}" name="{{this}}">
+    </button>
+  {{else}}
+    <button class="btn icon-{{this}}" id="entry-{{this}}" name="{{this}}">
+    </button>
+  {{/if}}
 </template>
diff --git a/shared/router.coffee b/shared/router.coffee
index 9a2e92ce..57643fa6 100644
--- a/shared/router.coffee
+++ b/shared/router.coffee
@@ -7,7 +7,7 @@ Router.map ->
       Session.set('buttonText', 'in')
       @next()
     onRun: ->
-      if Meteor.userId()
+      if Meteor.user()
         Router.go AccountsEntry.settings.dashboardRoute
 
       if AccountsEntry.settings.signInTemplate
@@ -34,6 +34,8 @@ Router.map ->
   @route "entrySignUp",
     path: "/sign-up"
     onBeforeAction: ->
+      if Meteor.user()
+        Router.go AccountsEntry.settings.dashboardRoute
       Session.set('entryError', undefined)
       Session.set('buttonText', 'up')
       @next()
@@ -62,6 +64,8 @@ Router.map ->
   @route "entryForgotPassword",
     path: "/forgot-password"
     onBeforeAction: ->
+      if Meteor.user()
+        Router.go AccountsEntry.settings.dashboardRoute
       Session.set('entryError', undefined)
       @next()
 
@@ -78,8 +82,10 @@ Router.map ->
   @route 'entryResetPassword',
     path: 'reset-password/:resetToken'
     onBeforeAction: ->
-      Session.set('entryError', undefined)
-      Session.set('resetToken', @params.resetToken)
+      if Meteor.user()
+        Router.go AccountsEntry.settings.dashboardRoute
+      Session.set 'entryError', null
+      Session.set 'resetToken', @params.resetToken
       @next()
 
 # Get all the accounts-entry routes one time