diff --git a/src/vorta/borg/borg_thread.py b/src/vorta/borg/borg_thread.py
index c70d55cb..950582a3 100644
--- a/src/vorta/borg/borg_thread.py
+++ b/src/vorta/borg/borg_thread.py
@@ -71,11 +71,7 @@ def __init__(self, cmd, params, parent=None):
         if 'additional_env' in params:
             env = {**env, **params['additional_env']}
 
-        password = params.get('password')
-        if password is not None:
-            env['BORG_PASSPHRASE'] = password
-        else:
-            env['BORG_PASSPHRASE'] = '9999999'  # Set dummy password to avoid prompt.
+        env['BORG_PASSPHRASE'] = params.get('password', '9999999')  # Set dummy password to avoid prompt.
 
         if env.get('BORG_PASSCOMMAND', False):
             env.pop('BORG_PASSPHRASE', None)  # Unset passphrase
diff --git a/src/vorta/borg/info.py b/src/vorta/borg/info.py
index 4d9fdf00..e1aacdc0 100644
--- a/src/vorta/borg/info.py
+++ b/src/vorta/borg/info.py
@@ -35,10 +35,8 @@ def prepare(cls, params):
             'BORG_RSH': 'ssh -oStrictHostKeyChecking=no'
         }
 
-        if params['password'] == '':
-            ret['password'] = '999999'  # Dummy password if the user didn't supply one. To avoid prompt.
-        else:
-            ret['password'] = params['password']
+        ret['password'] = params['password']  # Empty password is '', which disables prompt
+        if params['password'] != '':
             # Cannot tell if repo has encryption, assuming based off of password
             if not cls.keyring.is_unlocked:
                 ret['message'] = trans_late('messages', 'Please unlock your password manager.')