Added login tables and information
fixed conflicts