user pages control flow fixes
user pages control flow take 2