diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 8ce5fefdf..5609402e2 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -218,6 +218,10 @@ class member extends ModuleObject {
 		{
 			if($signupItem->name === 'find_account_question') return true;
 		}
+		if(!$config->agreements)
+		{
+			return true;
+		}
 
 		if($config->skin)
 		{
@@ -356,6 +360,13 @@ class member extends ModuleObject {
 				break;
 			}
 		}
+		if(!$config->agreements)
+		{
+			$config = memberModel::getMemberConfig();
+			$config->identifier = $config->identifier ?: 'user_id';
+			$config->signupForm = $oMemberAdminController->createSignupForm($config->identifier);
+			$output = $oModuleController->updateModuleConfig('member', $config);
+		}
 
 		if($config->skin)
 		{