AEROGEAR-874 "Registering a user throws NPE"
Merge branch 'AEROGEAR-874-username'