Problem with forgetting https password and SSO users

Summary

In the "I forgot my password" process flow, clicking "Reset password" link in the "forgot my password" email takes you to your "Projects" view and throws a "you are already signed in" message when using SSO for id/auth.

Steps to reproduce

SSO user (Login with PING (saml) in our instance) Click "I forgot my password" on YOUR_GITLAB_URL/profile/password/edit to change your https password Receive email, click "Reset password" link

What is the current bug behavior?

GitLab takes you to your default homepage view and throws up a "You are already signed in" message

What is the expected correct behavior?

GitLab should take you to a UI to change your https password

Relevant logs and/or screenshots

Screen_Shot_2017-09-19_at_2.38.47_PM

Results of GitLab environment info

Expand for output related to GitLab environment info 
Running 9.5.4...waiting on our admins to run below
(For installations with omnibus-gitlab package run and paste the output of:
sudo gitlab-rake gitlab:env:info)