2.07.2:Foffy123:38 Authentication fixes 2