* fix username template broken when master key is regenerated
* smaller improvements

