Merge with fixes for login issues