-RM-3770-MR-Resolve username attribute after password step
in order to always use the same kind of user identifier for the OTP step
(from redmine: issue id 3770, created on 2016-10-19)
in order to always use the same kind of user identifier for the OTP step
(from redmine: issue id 3770, created on 2016-10-19)