Fix #406 - cleaning and fixing a NPE on NUX Sign Up

Fix #406 - cleaning and fixing a NPE on NUX Sign Up