Fixes for the user security section