Minor employee/user template tweaks

--HG--
extra : source : ff6717a25daf12e4dcdb0520d2b9a2000f34d253
final employee fixes

--HG--
extra : source : 80373b6d541d044aa00bc20c3629f8008470be46
merged master