Fix never ending login loop & choose Button