Fix Bug - userstamp_key not retaining original value