FIX: added expand user