diff --git a/includes/admin.php b/includes/admin.php
index dcf019e..8a0556d 100644
--- a/includes/admin.php
+++ b/includes/admin.php
@@ -73,6 +73,13 @@ class CWV2_Admin {
 		if ( isset( $color['color'] ) ) {
 			update_option( 'cwv3_bg_color', $color['color'] );
 		}
+
+		foreach ( $this->get_settings_config() as $section ) {
+			foreach ( $section['fields'] as $option_data ) {
+				// Register settings
+				register_setting( 'cwv2-options', $this->option_prefix . $option_data['id'] );
+			}
+		}
 	}
 
 	/**
@@ -121,9 +128,6 @@ class CWV2_Admin {
 			if ( isset( $section['fields'] ) ) {
 				foreach ( $section['fields'] as $option_data ) {
 
-					// Register settings
-					register_setting( 'cwv2-options', $option_data['id'] );
-
 					add_settings_field(
 						$this->option_prefix . $option_data['id'],
 						$option_data['name'],