Final User Info Fixes