Added in return to correct spot functionality and bugfixed edit user