some authentification features
merge commit