This partially reverts b5543be1 by restoring the nesting
for the signup_enabled and signin_enabled attributes.