Fix phone register/verfiy flow