1 files changed, 9 insertions, 4 deletions
diff --git a/client/config/accounts.js b/client/config/accounts.js
index e12dd8bc..3852e580 100644
--- a/client/config/accounts.js
+++ b/client/config/accounts.js
@@ -9,20 +9,25 @@ AccountsTemplates.addFields([{
 }, emailField, passwordField]);
 
 AccountsTemplates.configure({
+  defaultLayout: 'userFormsLayout',
+  defaultContentRegion: 'content',
   confirmPassword: false,
   enablePasswordChange: true,
   sendVerificationEmail: true,
   showForgotPasswordLink: true,
   onLogoutHook: function() {
-    Router.go('Home');
+    var homePage = 'home';
+    if (FlowRouter.getRouteName() === homePage) {
+      FlowRouter.reload();
+    } else {
+      FlowRouter.go(homePage);
+    }
   }
 });
 
 _.each(['signIn', 'signUp', 'resetPwd', 'forgotPwd', 'enrollAccount'],
   function(routeName) {
-  AccountsTemplates.configureRoute(routeName, {
-    layoutTemplate: 'userFormsLayout'
-  });
+  AccountsTemplates.configureRoute(routeName);
 });
 
 // We display the form to change the password in a popup window that already