Bug fix

A bug fix from JoAnn's branch, just merging it with master so JoAnn's edit profile will be fixed and everyone else's agrees with it.