Tidies up User, fixes the PasswordController import in the
RegisterServlet. 

Change-Id: I39d54f56e084fb6d75da1b421aabe441cfedcefe