fix authentication image logic
Merge branch 'master' into steph