Fixed bug #7892: Unify User setup layout (Thanks to Steffen Kamper)