case 1581 - Update user login block after actual login has been made.
Merge branch 'case-1581' into develop