Fixes to sunshine login