2.07.2:Foffy123:37 Authentication fixes