Improve afm-user-session setup