Fix optional user properties