fix some issues after combine sign-in with register