FIX: fix user database corruption in case of a race condition

Conflicts:
	ChangeLog