diff --git a/install/tpl/nginx_apps.vhost.master b/install/tpl/nginx_apps.vhost.master
index a8fe664d98b4f776c553bf6b8d80793aa944e89d..2c720b55a86b9582e88ebd3f2619e787dab533c1 100644
--- a/install/tpl/nginx_apps.vhost.master
+++ b/install/tpl/nginx_apps.vhost.master
@@ -5,7 +5,7 @@ server {
 
         root   {apps_vhost_dir};
 
-        client_max_body_size 20M;
+        client_max_body_size 100M;
 
         location / {
                index index.php index.html;
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index eaf9e08086158d002ecef7cef2aff156a72520f7..3fbd278ddd8429fff180252aced120d53f7cc3db 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -39,4 +39,7 @@
         </div>
     </div>
 
-</div>
\ No newline at end of file
+</div>
+<script language="JavaScript" type="text/javascript">
+	$('#username').closest('form').attr('autocomplete','on');
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/blue/templates/main.tpl.htm b/interface/web/themes/blue/templates/main.tpl.htm
index 8d6ffde13cc1e8af8574abd15349282a001ee6a4..70c4f26cd400691f3e7873b5cc6445d2d581f386 100644
--- a/interface/web/themes/blue/templates/main.tpl.htm
+++ b/interface/web/themes/blue/templates/main.tpl.htm
@@ -22,7 +22,7 @@
             jQuery(document).ready(function() {
                 loadInitContent();
 				
-				$('form').attr('autocomplete','off');
+				$('form').not('#dummy_login_form').attr('autocomplete','off');
                 
                 $("#pageForm").submit(function(e){
                     //Prevent form submit: e.preventDefault() in lists
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index dee81175db4d0718639cef971aa644f8f43936d4..fd38222ce17aeb3c72e5b88d2f4175b1c639e08c 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -22,7 +22,7 @@
             jQuery(document).ready(function() {
                 loadInitContent();
 				
-				$('form').attr('autocomplete','off');
+				$('form').not('#dummy_login_form').attr('autocomplete','off');
                 
                 $("#pageForm").submit(function(e){
                     //Prevent form submit: e.preventDefault() in lists
diff --git a/server/conf/nginx_apps.vhost.master b/server/conf/nginx_apps.vhost.master
index a8fe664d98b4f776c553bf6b8d80793aa944e89d..2c720b55a86b9582e88ebd3f2619e787dab533c1 100644
--- a/server/conf/nginx_apps.vhost.master
+++ b/server/conf/nginx_apps.vhost.master
@@ -5,7 +5,7 @@ server {
 
         root   {apps_vhost_dir};
 
-        client_max_body_size 20M;
+        client_max_body_size 100M;
 
         location / {
                index index.php index.html;
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index c31aa671123271f59ddfd689a9ff64e3df6ddbee..666e8451cd43bdd1cdbb58ecfdc6b2ce66bbc8c0 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -217,6 +217,11 @@ class web_module {
 		} else {
 			exec($app->system->getinitcommand($daemon, 'reload').' 2>&1', $retval['output'], $retval['retval']);
 		}
+		
+		// nginx: do a syntax check because on some distributions, the init script always returns 0 - even if the syntax is not ok (how stupid is that?)
+		if($web_config['server_type'] == 'nginx' && $retval['retval'] == 0){
+			exec('nginx -t 2>&1', $retval['output'], $retval['retval']);
+		}
 		return $retval;
 	}