SIO-1306 Misplaced "You may log in here" popup after first run

Change-Id: I21598aa03a59237fba18f265d7c5e933b23a1520
Merge "SIO-1306 Misplaced "You may log in here" popup after first run"