AMEC-1779 added logic to use current user info
AMEC-1779 got response and challenge backwards
Merge remote-tracking branch 'origin/dev-AMEC-1779' into dev-AMEC-1779