Remade auth little bit