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

Change-Id: I24949c9714fa8d487fa4864c7853240954429883