Bug Fix - beforeSave on User uses different syntax