diff --git a/parity/cli.rs b/parity/cli.rs
index 144e2e51c..7192cc9ce 100644
--- a/parity/cli.rs
+++ b/parity/cli.rs
@@ -116,7 +116,7 @@ API and Console Options:
   --dapps-path PATH        Specify directory where dapps should be installed.
                            [default: $HOME/.parity/dapps]
 
-  --signer                 Enable Trusted Signer WebSocket endpoint used by
+  --signer-off             Disable Trusted Signer WebSocket endpoint used by
                            Signer UIs.
   --signer-port PORT       Specify the port of Trusted Signer server
                            [default: 8180].
@@ -274,7 +274,7 @@ pub struct Args {
 	pub flag_dapps_user: Option<String>,
 	pub flag_dapps_pass: Option<String>,
 	pub flag_dapps_path: String,
-	pub flag_signer: bool,
+	pub flag_signer_off: bool,
 	pub flag_signer_port: u16,
 	pub flag_signer_path: String,
 	pub flag_no_token: bool,
diff --git a/parity/configuration.rs b/parity/configuration.rs
index 94835a8a9..4196564b5 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -432,10 +432,10 @@ impl Configuration {
 	}
 
 	pub fn signer_port(&self) -> Option<u16> {
-		if self.args.flag_signer {
-			Some(self.args.flag_signer_port)
-		} else {
+		if self.args.flag_signer_off {
 			None
+		} else {
+			Some(self.args.flag_signer_port)
 		}
 	}
 }
diff --git a/parity/main.rs b/parity/main.rs
index b610e3025..c6960993a 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -192,7 +192,7 @@ fn execute_client(conf: Configuration, spec: Spec, client_config: ClientConfig)
 	let sync_config = conf.sync_config(&spec);
 
 	// Create and display a new token for UIs.
-	if conf.args.flag_signer && !conf.args.flag_no_token {
+	if !conf.args.flag_signer_off && !conf.args.flag_no_token {
 		new_token(conf.directories().signer).unwrap_or_else(|e| {
 			die!("Error generating token: {:?}", e)
 		});