diff --git a/jslib b/jslib
index deabffb7b0..22f576ea60 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit deabffb7b0aaf9873b212f9962158fc312c4f271
+Subproject commit 22f576ea60fdd19cd0eb3c11d3073a45240b9f98
diff --git a/src/app/send/add-edit.component.html b/src/app/send/add-edit.component.html
index 8e13d72ce8..48af19ba3c 100644
--- a/src/app/send/add-edit.component.html
+++ b/src/app/send/add-edit.component.html
@@ -116,8 +116,17 @@
                     <div class="col-6 form-group">
                         <label for="password" *ngIf="!hasPassword">{{'password' | i18n}}</label>
                         <label for="password" *ngIf="hasPassword">{{'newPassword' | i18n}}</label>
-                        <input id="password" class="form-control" type="password" name="Password"
-                            [(ngModel)]="password" [readOnly]="disableSend">
+                        <div class="input-group">
+                            <input id="password" class="form-control text-monospace" type="{{showPassword ? 'text' : 'password'}}"
+                                name="Password" [(ngModel)]="password" [readOnly]="disableSend">
+                            <div class="input-group-append">
+                                <button type="button" class="btn btn-outline-secondary" appA11yTitle="{{'toggleVisibility' | i18n}}"
+                                    (click)="togglePasswordVisible()">
+                                    <i class="fa fa-lg" aria-hidden="true"
+                                        [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                                </button>
+                            </div>
+                        </div>
                         <div class="form-text text-muted small">{{'sendPasswordDesc' | i18n}}</div>
                     </div>
                 </div>
diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html
index 04d093b244..4da51250f4 100644
--- a/src/app/send/send.component.html
+++ b/src/app/send/send.component.html
@@ -107,7 +107,7 @@
                                         {{'copySendLink' | i18n}}
                                     </a>
                                     <a class="dropdown-item" href="#" appStopClick (click)="removePassword(s)"
-                                        *ngIf="s.password">
+                                        *ngIf="s.password && !disableSend">
                                         <i class="fa fa-fw fa-undo" aria-hidden="true"></i>
                                         {{'removePassword' | i18n}}
                                     </a>