diff --git a/ChangeLog b/ChangeLog
index 983a91a..005517f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Version 4.5.0.8 'dan Eider':
 	- Fix for Verbose config file option -v cli option overridea
 	- Add a Notice to config about realm default value is the domain name.
 	- Update total allocation usage on client shutdown
+        - fix total and user quota mix-up
 
 12/10/2017 Oleg Moskalenko <mom040267@gmail.com>
 Version 4.5.0.7 'dan Eider':
diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c
index 0058f0e..e8d740d 100644
--- a/src/apps/relay/mainrelay.c
+++ b/src/apps/relay/mainrelay.c
@@ -1248,11 +1248,11 @@ static void set_option(int c, char *value)
 		set_default_realm_name(value);
 		break;
 	case 'q':
-		turn_params.total_quota = (vint)atoi(value);
+		turn_params.user_quota = (vint)atoi(value);
 		get_realm(NULL)->options.perf_options.user_quota = atoi(value);
 		break;
 	case 'Q':
-		turn_params.user_quota = (vint)atoi(value);
+		turn_params.total_quota = (vint)atoi(value);
 		get_realm(NULL)->options.perf_options.total_quota = atoi(value);
 		break;
 	case 's':