User id gets succesfully set when the user submits the log in
fixed merge conflict in /api/index.php