Updated UserRegister flow

- Fixed gcmreg to userreg flow
- Code cleanup