Merge "Revert "Remove cssclass in the favor of 'type' => 'user'""