Re-Evaluated LoginClient and Improvements