fixed edit + added  user type welkom
Merge origin/InDev into InDev