Change logic about user authentification