Login screen has better error trapping