regression fix for user login dropdown
Merge branch 'bugid-23457' into dev