Merge "Check user validity before retrying authentication"