diff --git a/index.html b/index.html
index 4df5e4c22..735baf2b0 100644
--- a/index.html
+++ b/index.html
@@ -105,6 +105,10 @@
             <div class="col col-sm-12 col-md-3"><label for=cn_ssh_user class=cn_label><u>U</u>ser:</label></div>
             <div class="col col-sm-12 col-md-9"><input id=cn_ssh_user name=user size=10></div>
           </div>
+          <div class="row">
+            <div class="col col-sm-12 col-md-3"><label for=cn_ssh_pass class=cn_label><u>P</u>assword&nbsp;/&nbsp;passphrase:</label></div>
+            <div class="col col-sm-12 col-md-9"><input id=cn_ssh_pass type=password></div>
+          </div>
           <div class="row">
             <div class="col col-sm-12 col-md-3"><label for=cn_ssh_key class=cn_label><u>K</u>ey file:</label></div>
             <div class="col col-sm-12 col-md-9">
@@ -112,10 +116,6 @@
               <button id=cn_ssh_key_dots class=tb_btn><span class="fas fa-ellipsis-h"></span></button>
             </div>
           </div>
-          <div class="row">
-            <div class="col col-sm-12 col-md-3"><label for=cn_ssh_pass class=cn_label><u>P</u>assword&nbsp;/&nbsp;passphrase:</label></div>
-            <div class="col col-sm-12 col-md-9"><input id=cn_ssh_pass type=password></div>
-          </div>
         </div>
         <div id=cn_ssl hidden>
           <div class="row">
diff --git a/src/cn.js b/src/cn.js
index 75c8dd90c..1471aef5a 100644
--- a/src/cn.js
+++ b/src/cn.js
@@ -305,7 +305,7 @@
         $.err(`${q.cwd.labels[0].innerText} "${untildify(x.cwd)}" does not exist`, () => { q.cwd.focus(); });
         return 0;
       }
-      if (x === sel && ssh) {
+      if (ssh) {
         if (!q.ssh_pass.value && !q.ssh_key.value) {
           passwdPrompt(`Password for user ${x.user || user}:`, 'Password');
           return 0;
@@ -485,11 +485,6 @@
               port: +x.ssh_port || 22,
               user: x.user || user,
             };
-            // if (x.ssh_auth_type === 'key') {
-            //   o.key = x.ssh_key;
-            // } else {
-            //   o.pass = x === sel ? q.ssh_pass.value : '';
-            // }
             x.ssh_key && (o.key = x.ssh_key);
             x === sel && q.ssh_pass.value && (o.pass = q.ssh_pass.value);
             const c = sshExec(o, '/bin/sh', (e, sm) => {
@@ -1147,8 +1142,8 @@
       const m = HP.exec(h.l); // parse host and port
       m ? go({
         type: 'listen',
-        host: m[1], 
-        port: +m[2] || 4502, 
+        host: m[1],
+        port: +m[2] || 4502,
         respawn: !!m[3],
         log: h.log,
       }) : $.err('Invalid $RIDE_LISTEN');