Changes after feedback towards Authentication related. Work in progress