Fix the email and change permission process