diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
index 7eeab3880caf9cb5777a5f5493908ff0e9f6ceba..24034d1e7479b47119da499e8e57157c0524628a 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
@@ -229,7 +229,9 @@ public class UserController extends HttpServlet {
                     FormValidation formValidation = FormValidator.validateForm("userForm",request,getServletContext());
                     FormField usernameField = formValidation.getFormField("username");
                     FormField passwordField = formValidation.getFormField("pass1");
-                    String username = usernameField.getWebValue().trim();
+                    String username = (usernameField != null && usernameField.getWebValue() != null && !usernameField.getWebValue().trim().isEmpty()) ?
+                                        usernameField.getWebValue().trim()
+                                        : null;
                     String password = (passwordField != null && passwordField.getWebValue() != null && !passwordField.getWebValue().trim().isEmpty()) ?
                                         passwordField.getWebValue().trim()
                                         : null;