Added activated flag to User, Activatable concern changed