Fixed bugs caused by previous commits.
Merge branch 'voipex-fixes' of github.com:bssstudio/php-addressbook into voipex-fixes

Conflicts:
	register/user_add_save.php