Fix bug with user profile edit form labels and error messages.
Merge pull request #386 from shadlaws/fixes_20130608

Fix bug with user profile edit form labels and error messages.