User edit fix