-RM-3721-MR-Login flow with one screen?
If the flow with two screens is not satisfactory, implement everything in one step i.e. password and OTP in the same form. Must make a copy of the existing Password flow and add the second factor in it.
(from redmine: issue id 3721, created on 2016-07-13, closed on 2016-11-28)