Bug 915255 - Additional check to try to auth

[merge]