ok done and I fix it for admin too.

I guess this PR is ready to merge, what do you think @rande ?