Fixed user login imbeds
fixed merge conflicts