Fixed create/modify user bug.
I-123343
Merge branch 'technology-2014-07-31'

Conflicts:
	queries/insert_user_account