fix on hadminmenu
Merge branch 'hotfixes' into develop