Inheriting from the proper template. Does currently not have practical consequences, but is more appropriate this way.
(cherry picked from commit 840ee75)
Added menu entries for the user bundle.
(cherry picked from commit 551eca6)