corrected server and user naming