Expanding topic

Fixes for user update functions as well.