Adjusted states helper

Selects Users current state by default