[#783] Extension of User model

@kardan Can you check / merge?