Some other updates on the server side to accomodate for the new change with username