Login: Fix - Some Failures