quick fix for other layout and new user account