Partial fix for multiple user creation and push notification