Fix code &  [WIP]Forgot password