diff --git a/scripts/change_url b/scripts/change_url
index 1669088..7c6e6d2 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -8,6 +8,7 @@
 
 source _common.sh
 source /usr/share/yunohost/helpers
+ynh_abort_if_errors
 
 #=================================================
 # RETRIEVE ARGUMENTS
diff --git a/sources/patches/app-fix-login-page-when-ssoed.patch b/sources/patches/app-fix-login-page-when-ssoed.patch
new file mode 100644
index 0000000..f5c38a9
--- /dev/null
+++ b/sources/patches/app-fix-login-page-when-ssoed.patch
@@ -0,0 +1,14 @@
+diff -ruN roundcube.orig/index.php roundcube/index.php
+--- roundcube.orig/index.php	2021-04-26 14:48:33.169655413 +0200
++++ roundcube/index.php	2021-04-26 14:54:07.594479133 +0200
+@@ -210,6 +210,10 @@
+     if (!$RCMAIL->session->check_auth()) {
+         $RCMAIL->kill_session();
+         $session_error = 'sessionerror';
++        if (!empty($_SERVER['PHP_AUTH_USER'])) {
++            header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
++            exit;
++        }
+     }
+ }
+