Fix login

Combine Login methods to prevent previous "double click" issue