User auth

fixed merge conflict, added buggy user_auth