diff --git a/contrib/webserver/piler-nginx.conf b/contrib/webserver/piler-nginx.conf
index 0497a6a1..fea6f9be 100644
--- a/contrib/webserver/piler-nginx.conf
+++ b/contrib/webserver/piler-nginx.conf
@@ -1,11 +1,10 @@
 
 #### IMPORTANT!!!
 ####
-#### Fix the listen IP-address, and the hostname
+#### Fix the hostname
 ####
 
 server {
-        listen       1.2.3.4:80;
         server_name  piler.yourdomain.com;
 
         root /var/www/piler.piler.yourdomain.com;
@@ -43,6 +42,11 @@ server {
         rewrite /login.php /index.php?route=login/login;
         rewrite /logout.php /index.php?route=login/logout;
         rewrite /google.php /index.php?route=login/google;
+        rewrite /domain.php /index.php?route=domain/domain;
+        rewrite /ldap.php /index.php?route=ldap/list;
+        rewrite /customer.php /index.php?route=customer/list;
+        rewrite /retention.php /index.php?route=policy/retention;
+        rewrite /archiving.php /index.php?route=policy/archiving;
         rewrite /view/javascript/piler.js /js.php;
 }
 
diff --git a/webui/controller/user/edit.php b/webui/controller/user/edit.php
index 8c7152b3..31e5a768 100644
--- a/webui/controller/user/edit.php
+++ b/webui/controller/user/edit.php
@@ -93,23 +93,14 @@ class ControllerUserEdit extends Controller {
 
    private function validate() {
 
-      //if provided, the password must be greater than the MIN_PASSWORD_LENGTH
-      if(isset($this->request->post['password']) && strlen(@$this->request->post['password']) < MIN_PASSWORD_LENGTH) {
-         $this->error['password'] = $this->data['text_too_short_password'];
-      }
-      //if provided, the password2 must be greater than the MIN_PASSWORD_LENGTH
-      if(isset($this->request->post['password2']) && strlen(@$this->request->post['password2']) < MIN_PASSWORD_LENGTH) {
-         $this->error['password2'] = $this->data['text_too_short_password'];
-      }
-      
-      if(isset($this->request->post['password']) && strlen(@$this->request->post['password']) > 1) {
+      if(isset($this->request->post['password']) && strlen($this->request->post['password']) > 1) {
 
          if(strlen(@$this->request->post['password']) < MIN_PASSWORD_LENGTH || strlen(@$this->request->post['password2']) < MIN_PASSWORD_LENGTH) {
             $this->error['password'] = $this->data['text_invalid_password'];
          }
 
          if($this->request->post['password'] != $this->request->post['password2']) {
-            $this->error['password'] = $this->data['text_password_mismatch'];
+            $this->error['password2'] = $this->data['text_password_mismatch'];
          }
       }