Fixed return & removed extra lines

Removed unnecessary code
Added a return TRUE for the 2-step authentication to work (whoops again)