diff --git a/CHANGELOG b/CHANGELOG
index d73fa68..4460de8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 
 1.5 ?
 - Update to movim 0.9 git2016-01-06
+- fix #16 (Installing movim crashes agendav) because of bad ssowatconf/regex
+- script/install : removed skipped_uris
+- script/install : sed DisconnectController.php to avoid redirect to ?login after ?disconnect
+- script/upgrade : removed skipped_uris
+- script/upgrade : sed DisconnectController.php to avoid redirect to ?login after ?disconnect
 
 1.4 2015-12-28
 - IMPORTANT (upgrades only): public pod option has been removed and replaced by SSO option.
diff --git a/scripts/install b/scripts/install
index 6656fde..16b0809 100644
--- a/scripts/install
+++ b/scripts/install
@@ -132,7 +132,8 @@ then
 	sudo su -c "cd $final_path && php mud.php config xmppwhitelist:$domain" movim
 else
 	sudo yunohost app setting movim unprotected_uris -v "/"
-	sudo yunohost app setting movim skipped_regex -v "login"
+        # Next line is to avoid SSO to auto-connect just after disconnect
+        sudo sed -i "s@redirect('login')@redirect('')@g" $final_path/app/controllers/DisconnectController.php
 	sudo yunohost app ssowatconf
 fi
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 7bec796..a55af34 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -66,7 +66,8 @@ then
         sudo su -c "cd $final_path && php mud.php config xmppwhitelist:$domain" movim
 else
         sudo yunohost app setting movim unprotected_uris -v "/"
-	sudo yunohost app setting movim skipped_regex -v "login"
+        # Next line is to avoid SSO to auto-connect just after disconnect
+        sudo sed -i "s@redirect('login')@redirect('')@g" $final_path/app/controllers/DisconnectController.php
         sudo yunohost app ssowatconf
 fi