diff --git a/docs/source/includes/config_urls.txt b/docs/source/includes/config_urls.txt
index e8ac8f54..8b67cf31 100644
--- a/docs/source/includes/config_urls.txt
+++ b/docs/source/includes/config_urls.txt
@@ -1,15 +1,16 @@
 ::
 
     # URLs                        # Default
-    USER_CHANGE_PASSWORD_URL      = '/user/change-password'
-    USER_CHANGE_USERNAME_URL      = '/user/change-username'
-    USER_CONFIRM_EMAIL_URL        = '/user/confirm-email/<token>'
-    USER_EMAIL_ACTION_URL         = '/user/email/<id>/<action>'     # v0.5.1 and up
-    USER_FORGOT_PASSWORD_URL      = '/user/forgot-password'
-    USER_INVITE_URL               = '/user/invite'                  # v0.6.2 and up
-    USER_LOGIN_URL                = '/user/login'
-    USER_LOGOUT_URL               = '/user/logout'
-    USER_MANAGE_EMAILS_URL        = '/user/manage-emails'
-    USER_REGISTER_URL             = '/user/register'
-    USER_RESEND_CONFIRM_EMAIL_URL = '/user/resend-confirm-email'    # v0.5.0 and up
-    USER_RESET_PASSWORD_URL       = '/user/reset-password/<token>'
+    USER_URL_PREFIX               = '/user'
+    USER_CHANGE_PASSWORD_URL      = USER_URL_PREFIX + '/change-password'
+    USER_CHANGE_USERNAME_URL      = USER_URL_PREFIX + '/change-username'
+    USER_CONFIRM_EMAIL_URL        = USER_URL_PREFIX + '/confirm-email/<token>'
+    USER_EMAIL_ACTION_URL         = USER_URL_PREFIX + '/email/<id>/<action>'     # v0.5.1 and up
+    USER_FORGOT_PASSWORD_URL      = USER_URL_PREFIX + '/forgot-password'
+    USER_INVITE_URL               = USER_URL_PREFIX + '/invite'                  # v0.6.2 and up
+    USER_LOGIN_URL                = USER_URL_PREFIX + '/login'
+    USER_LOGOUT_URL               = USER_URL_PREFIX + '/logout'
+    USER_MANAGE_EMAILS_URL        = USER_URL_PREFIX + '/manage-emails'
+    USER_REGISTER_URL             = USER_URL_PREFIX + '/register'
+    USER_RESEND_CONFIRM_EMAIL_URL = USER_URL_PREFIX + '/resend-confirm-email'    # v0.5.0 and up
+    USER_RESET_PASSWORD_URL       = USER_URL_PREFIX + '/reset-password/<token>'
diff --git a/flask_user/settings.py b/flask_user/settings.py
index 519093e2..c35105e3 100644
--- a/flask_user/settings.py
+++ b/flask_user/settings.py
@@ -53,19 +53,20 @@ def set_default_settings(user_manager, app_config):
     um.show_username_email_does_not_exist = sd('USER_SHOW_USERNAME_EMAIL_DOES_NOT_EXIST', um.enable_register)
 
     # Set default URLs
-    um.change_password_url       = sd('USER_CHANGE_PASSWORD_URL',        '/user/change-password')
-    um.change_username_url       = sd('USER_CHANGE_USERNAME_URL',        '/user/change-username')
-    um.confirm_email_url         = sd('USER_CONFIRM_EMAIL_URL',          '/user/confirm-email/<token>')
-    um.email_action_url          = sd('USER_EMAIL_ACTION_URL',           '/user/email/<id>/<action>')
-    um.forgot_password_url       = sd('USER_FORGOT_PASSWORD_URL',        '/user/forgot-password')
-    um.login_url                 = sd('USER_LOGIN_URL',                  '/user/sign-in')
-    um.logout_url                = sd('USER_LOGOUT_URL',                 '/user/sign-out')
-    um.manage_emails_url         = sd('USER_MANAGE_EMAILS_URL',          '/user/manage-emails')
-    um.register_url              = sd('USER_REGISTER_URL',               '/user/register')
-    um.resend_confirm_email_url  = sd('USER_RESEND_CONFIRM_EMAIL_URL',   '/user/resend-confirm-email')
-    um.reset_password_url        = sd('USER_RESET_PASSWORD_URL',         '/user/reset-password/<token>')
-    um.user_profile_url          = sd('USER_PROFILE_URL',                '/user/profile')
-    um.invite_url                = sd('USER_INVITE_URL',                 '/user/invite')
+    um.url_prefix                = sd('USER_URL_PREFIX',                 '/user')
+    um.change_password_url       = sd('USER_CHANGE_PASSWORD_URL',        um.url_prefix + '/change-password')
+    um.change_username_url       = sd('USER_CHANGE_USERNAME_URL',        um.url_prefix + '/change-username')
+    um.confirm_email_url         = sd('USER_CONFIRM_EMAIL_URL',          um.url_prefix + '/confirm-email/<token>')
+    um.email_action_url          = sd('USER_EMAIL_ACTION_URL',           um.url_prefix + '/email/<id>/<action>')
+    um.forgot_password_url       = sd('USER_FORGOT_PASSWORD_URL',        um.url_prefix + '/forgot-password')
+    um.login_url                 = sd('USER_LOGIN_URL',                  um.url_prefix + '/sign-in')
+    um.logout_url                = sd('USER_LOGOUT_URL',                 um.url_prefix + '/sign-out')
+    um.manage_emails_url         = sd('USER_MANAGE_EMAILS_URL',          um.url_prefix + '/manage-emails')
+    um.register_url              = sd('USER_REGISTER_URL',               um.url_prefix + '/register')
+    um.resend_confirm_email_url  = sd('USER_RESEND_CONFIRM_EMAIL_URL',   um.url_prefix + '/resend-confirm-email')
+    um.reset_password_url        = sd('USER_RESET_PASSWORD_URL',         um.url_prefix + '/reset-password/<token>')
+    um.user_profile_url          = sd('USER_PROFILE_URL',                um.url_prefix + '/profile')
+    um.invite_url                = sd('USER_INVITE_URL',                 um.url_prefix + '/invite')
 
     # Set default ENDPOINTs
     home_endpoint = ''
diff --git a/flask_user/views.py b/flask_user/views.py
index 28f4e650..e7c62c0a 100644
--- a/flask_user/views.py
+++ b/flask_user/views.py
@@ -440,13 +440,11 @@ def register():
                                      user=user,
                                      user_invite=user_invite)
 
-        # Redirect if USER_ENABLE_CONFIRM_EMAIL is set
-        if user_manager.enable_confirm_email and require_email_confirmation:
-            next = request.args.get('next', _endpoint_url(user_manager.after_register_endpoint))
-            return redirect(next)
+        # Redirect if USER_ENABLE_CONFIRM_EMAIL is set and they can't login yet
+        if user_manager.enable_confirm_email and require_email_confirmation and not user_manager.enable_login_without_confirm_email:
+            return redirect(reg_next)
 
         # Auto-login after register or redirect to login page
-        next = request.args.get('next', _endpoint_url(user_manager.after_confirm_endpoint))
         if user_manager.auto_login_after_register:
             return _do_login_user(user, reg_next)                     # auto-login
         else: