diff --git a/src/rmview/connection.py b/src/rmview/connection.py
index d70afb3..9472463 100644
--- a/src/rmview/connection.py
+++ b/src/rmview/connection.py
@@ -52,7 +52,7 @@ class rMConnect(QRunnable):
       else:
         pkey = None
         if password is None:
-          raise Exception("Must provide either password or SSH key")
+          log.warning("No key nor password given. System-wide SSH connection parameters are going to be used.")
 
       self.options = {
         'username': username,
diff --git a/src/rmview/rmview.py b/src/rmview/rmview.py
index 7f9b2eb..885500a 100644
--- a/src/rmview/rmview.py
+++ b/src/rmview/rmview.py
@@ -143,12 +143,8 @@ class rMViewApp(QApplication):
   def ensureConnConfig(self):
     if self.config['ssh'].get('address') is None:
       address, ok = QInputDialog.getText(self.viewer, "Configuration","IP Address of your reMarkable:", QLineEdit.Normal, "10.11.99.1")
-      if ok and address:
-        self.config['ssh']['address'] = address
-      else:
-        self.quit()
 
-    if self.config['ssh'].get('password') is None and self.config['ssh'].get('key') is None:
+    if self.config['ssh'].get('ask_password'):
       password, ok = QInputDialog.getText(self.viewer, "Configuration","reMarkable password:", QLineEdit.Password)
       if ok:
         self.config['ssh']['password'] = password or ""