diff --git a/src/main.tsx b/src/main.tsx
index 2b915d9f6..325fa3781 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -976,6 +976,21 @@ class InfoRemoteEdit extends React.Component<{}, {}> {
         }
     }
 
+    canResetPw() : boolean {
+        let redit = this.getRemoteEdit();
+        if (redit == null) {
+            return false;
+        }
+        return redit.haspassword && this.passwordStr.get() != PasswordUnchangedSentinel;
+    }
+
+    @boundMethod
+    resetPw() : void {
+        mobx.action(() => {
+            this.passwordStr.set(PasswordUnchangedSentinel);
+        })();
+    }
+
     @boundMethod
     doSubmitRemote() {
         let redit = this.getRemoteEdit();
@@ -1253,6 +1268,9 @@ class InfoRemoteEdit extends React.Component<{}, {}> {
                         <div className="remote-field-label">ssh password</div>
                         <div className="remote-field-control text-input">
                             <input type="password" onFocus={this.onFocusPasswordStr} onChange={this.onChangePasswordStr} value={this.passwordStr.get()}/>
+                            <If condition={this.canResetPw()}>
+                                <i onClick={this.resetPw} title="restore to original password" className="icon fa fa-undo undo-icon"/>
+                            </If>
                         </div>
                     </div>
                 </If>
diff --git a/src/sh2.less b/src/sh2.less
index 5a23497b4..5b5a78625 100644
--- a/src/sh2.less
+++ b/src/sh2.less
@@ -905,6 +905,12 @@ body .xterm .xterm-viewport {
                     color: @term-bright-white;
                 }
 
+                .undo-icon {
+                    margin-left: 4px;
+                    cursor: pointer;
+                    padding: 2px;
+                }
+
                 .remote-field-control {
                     &.text-control {
                     }