Fix clients not starting up in the correct screen