diff --git a/application/controllers/User.php b/application/controllers/User.php
index aed72819e..f9ba8969a 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -302,12 +302,12 @@ class User extends CI_Controller {
 				$this->input->post('qso_widget_display_qso_time'),
 				$this->input->post('user_dashboard_banner') ?? 'Y',
 				$this->input->post('user_dashboard_solar') ?? 'Y',
-				$this->input->post('clubstation') == '1' ? true : false,
 				$this->input->post('global_oqrs_text') ?? '',
 				$this->input->post('oqrs_grouped_search') ?? 'off',
 				$this->input->post('oqrs_grouped_search_show_station_name') ?? 'off',
 				$this->input->post('oqrs_auto_matching') ?? 'on',
-				$this->input->post('oqrs_direct_auto_matching') ?? 'on')
+				$this->input->post('oqrs_direct_auto_matching') ?? 'on',
+				$this->input->post('clubstation') == '1' ? true : false)
 			) {
 				// Check for errors
 				case EUSERNAMEEXISTS:
diff --git a/application/models/User_model.php b/application/models/User_model.php
index a189f1546..219609c27 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -224,7 +224,8 @@ class User_Model extends CI_Model {
 		$user_wwff_to_qso_tab, $user_pota_to_qso_tab, $user_sig_to_qso_tab, $user_dok_to_qso_tab,
 		$user_lotw_name, $user_lotw_password, $user_eqsl_name, $user_eqsl_password, $user_clublog_name, $user_clublog_password,
 		$user_winkey, $on_air_widget_enabled, $on_air_widget_display_last_seen, $on_air_widget_show_only_most_recent_radio,
-		$qso_widget_display_qso_time, $dashboard_banner,$dashboard_solar, $clubstation = 0) {
+		$qso_widget_display_qso_time, $dashboard_banner, $dashboard_solar, $global_oqrs_text, $oqrs_grouped_search,
+		$oqrs_grouped_search_show_station_name, $oqrs_auto_matching, $oqrs_direct_auto_matching, $clubstation = 0) {
 		// Check that the user isn't already used
 		if(!$this->exists($username)) {
 			$data = array(