diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index 1bcae51..64062f9 100644
--- a/openssh-askpass-gnome.spec
+++ b/openssh-askpass-gnome.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
diff --git a/openssh.changes b/openssh.changes
index 83d63c8..198178e 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 22 16:55:25 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- ssh-askpass: Try a fallback if the other option is not available
+
 -------------------------------------------------------------------
 Fri May 31 11:14:42 UTC 2019 - Vítězslav Čížek <vcizek@suse.com>
 
diff --git a/openssh.spec b/openssh.spec
index 5abeb31..4713cf3 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
diff --git a/ssh-askpass b/ssh-askpass
index 0ad5300..fd58c70 100644
--- a/ssh-askpass
+++ b/ssh-askpass
@@ -15,10 +15,12 @@ KDE_SSH_ASKPASS="@LIBEXECDIR@/ssh/ksshaskpass"
 
 case "$SESSION" in
   kde)
-	exec $KDE_SSH_ASKPASS ${1+"$@"}
+	[ -e $KDE_SSH_ASKPASS ] && exec $KDE_SSH_ASKPASS ${1+"$@"}
+	exec $GNOME_SSH_ASKPASS ${1+"$@"}
   ;;
   *)
-	exec $GNOME_SSH_ASKPASS ${1+"$@"}
+	[ -e GNOME_SSH_ASKPASS ] && exec $GNOME_SSH_ASKPASS ${1+"$@"}
+	exec $KDE_SSH_ASKPASS ${1+"$@"}
   ;;
 esac