diff --git a/src/converse-muc.js b/src/converse-muc.js
index b1001d888..021844946 100755
--- a/src/converse-muc.js
+++ b/src/converse-muc.js
@@ -839,7 +839,11 @@
                         affiliations = [affiliations];
                     }
                     return new Promise((resolve, reject) => {
-                        const promises = _.map(affiliations, _.partial(this.requestMemberList, this.model.get('jid')));
+                        const promises = _.map(
+                            affiliations,
+                            _.partial(this.requestMemberList, this.model.get('jid'))
+                        );
+
                         Promise.all(promises).then(
                             _.flow(this.marshallAffiliationIQs.bind(this), resolve),
                             _.flow(this.marshallAffiliationIQs.bind(this), resolve)
diff --git a/src/converse-register.js b/src/converse-register.js
index 41c513e6b..e8324fef6 100644
--- a/src/converse-register.js
+++ b/src/converse-register.js
@@ -147,8 +147,8 @@
 
             const RegistrationRouter = Backbone.Router.extend({
                 initialize () {
-                    this.route('converse-login', _.partial(this.setActiveForm, 'login'));
-                    this.route('converse-register', _.partial(this.setActiveForm, 'register'));
+                    this.route('converse/login', _.partial(this.setActiveForm, 'login'));
+                    this.route('converse/register', _.partial(this.setActiveForm, 'register'));
                 },
                 setActiveForm (value) {
                     _converse.api.waitUntil('controlboxInitialized').then(() => {
diff --git a/src/templates/register_link.html b/src/templates/register_link.html
index 9606212f4..3a364a0d3 100644
--- a/src/templates/register_link.html
+++ b/src/templates/register_link.html
@@ -1,4 +1,4 @@
 <div class="switch-form">
     <p>{{{ __("Don't have a chat account?") }}}</p>
-    <p><a class="register-account toggle-register-login" href="#converse-register">{{{__("Create an account")}}}</a></p>
+    <p><a class="register-account toggle-register-login" href="#converse/register">{{{__("Create an account")}}}</a></p>
 </div>
diff --git a/src/templates/register_panel.html b/src/templates/register_panel.html
index a74c5e639..ee0877d44 100644
--- a/src/templates/register_panel.html
+++ b/src/templates/register_panel.html
@@ -17,6 +17,6 @@
 <div class="switch-form">
     <p>{{{ __("Already have a chat account?") }}}</p>
     <p>
-        <a class="login-here toggle-register-login" href="#converse-login">{{{__("Log in here")}}}</a>
+        <a class="login-here toggle-register-login" href="#converse/login">{{{__("Log in here")}}}</a>
     </p>
 </div>