Bug fix for login screen back button issue