Default user state history to Unverified if its empty
Merge in latest from models