fixed a bug with contacting the server
added returning user check