diff --git a/src/restore.html b/src/restore.html
index 93ddcf527..dd715fc61 100644
--- a/src/restore.html
+++ b/src/restore.html
@@ -272,12 +272,14 @@
                                     <input type="text" class="form-control" ng-model="password" id="inputConfigureBackupPassword" name="prefix" ng-disabled="busy" placeholder="Passphrase used to encrypt the backups" ng-required="encrypted">
                                 </div>
 
-                                <div class="checkbox" ng-show="format === 'rsync'">
+                                <div class="checkbox" ng-show="format === 'rsync' && password.length !== 0">
                                     <label>
                                       <input type="checkbox" ng-model="encryptedFilenames">Decrypt Filenames</input>
                                     </label>
                                 </div>
 
+                                <br/>
+
                                 <div class="checkbox">
                                     <label>
                                         <input type="checkbox" ng-model="skipDnsSetup"><b>Dry run</b></sup>