Change the order of steps and add another check screen.
    
    Since GDM shows the "system-menu-button", it could not correctly
    switch users on a locked screen. I added a check to see
    if we are on a locked screen and behave accordingly.