diff --git a/app/index.html b/app/index.html
index f6b2420..ae47f65 100644
--- a/app/index.html
+++ b/app/index.html
@@ -40,6 +40,14 @@
                   <td>Port</td>
                   <td><input id="port" type="text" data-bind="value: port" required></td>
                 </tr>
+                <tr data-bind="if: $root.config.connectDialog.username">
+                  <td>Username</td>
+                  <td><input id="username" type="text" data-bind="value: username" required></td>
+                </tr>
+                <tr data-bind="if: $root.config.connectDialog.password">
+                  <td>Password</td>
+                  <td><input id="password" type="password" data-bind="value: password"></td>
+                </tr>
                 <tr data-bind="if: $root.config.connectDialog.token">
                   <td>Tokens</td>
                   <td>
@@ -48,22 +56,14 @@
                 </tr>
                 <tr data-bind="if: $root.config.connectDialog.token">
                       <td></td>
-		      <td>
+                      <td>
                         <button class="dialog-submit" type="button" data-bind="enable: selectedTokens().length > 0, click: removeSelectedTokens()">Remove</button>
                         <button class="dialog-submit" type="button" data-bind="enable: tokenToAdd().length > 0, click: addToken()">Add</button>
-  		      </td>
+                     </td>
                 </tr>
-		<tr data-bind="if: $root.config.connectDialog.token, visible: tokens().length > 0">
-		  <td></td>
-		  <td><select id="token" multiple="multiple" height="5" data-bind="options:tokens, selectedOptions:selectedTokens"></select></td>
-		</tr>
-                <tr data-bind="if: $root.config.connectDialog.username">
-                  <td>Username</td>
-                  <td><input id="username" type="text" data-bind="value: username" required></td>
-                </tr>
-                <tr data-bind="if: $root.config.connectDialog.password">
-                  <td>Password</td>
-                  <td><input id="password" type="password" data-bind="value: password"></td>
+               <tr data-bind="if: $root.config.connectDialog.token, visible: tokens().length > 0">
+                <td></td>
+                  <td><select id="token" multiple="multiple" height="5" data-bind="options:tokens, selectedOptions:selectedTokens"></select></td>
                 </tr>
                 <tr data-bind="if: $root.config.connectDialog.channelName">
                   <td>Channel</td>