Fixes for reg and login from pemula