Refactor Reauthenticate components - follow up fixes
#50355
Merged
Reauthenticate components - follow up fixes
#50355