diff --git a/src/app/models/LivestreamerParameters.js b/src/app/models/LivestreamerParameters.js
index 0ed1d668b9..8412b30b41 100644
--- a/src/app/models/LivestreamerParameters.js
+++ b/src/app/models/LivestreamerParameters.js
@@ -85,7 +85,7 @@ export const parameters = [
 	),
 	new Parameter(
 		"--twitch-oauth-token",
-		"session.isLoggedIn",
+		[ "session.isLoggedIn", "settings.livestreamer_oauth" ],
 		"session.access_token"
 	),
 	new Parameter(
diff --git a/src/app/models/localstorage/Settings.js b/src/app/models/localstorage/Settings.js
index 01900e767a..116e5e1003 100644
--- a/src/app/models/localstorage/Settings.js
+++ b/src/app/models/localstorage/Settings.js
@@ -27,6 +27,7 @@ export default Model.extend({
 	advanced            : attr( "boolean", { defaultValue: false } ),
 	livestreamer        : attr( "string",  { defaultValue: "" } ),
 	livestreamer_params : attr( "string",  { defaultValue: "" } ),
+	livestreamer_oauth  : attr( "boolean", { defaultValue: true } ),
 	quality             : attr( "number",  { defaultValue: 0 } ),
 	player              : attr( "string",  { defaultValue: "" } ),
 	player_params       : attr( "string",  { defaultValue: "" } ),
diff --git a/src/templates/settings/SettingsLivestreamer.hbs b/src/templates/settings/SettingsLivestreamer.hbs
index d4a08da7d3..a9698ae3a0 100644
--- a/src/templates/settings/SettingsLivestreamer.hbs
+++ b/src/templates/settings/SettingsLivestreamer.hbs
@@ -58,6 +58,15 @@
 	{{/unless}}
 {{/if}}
 
+{{#settings-row
+	"Twitch.tv login"
+	"Allow Livestreamer to use the Twitch.tv oauth token while being logged in."
+	icon="fa-sign-in"
+	documentation="--twitch-oauth-token"
+}}
+	{{check-box "Authenticate when launching a stream" checked=model.livestreamer_oauth}}
+{{/settings-row}}
+
 {{#settings-row
 	"Launch attempts"
 	"Number of stream launch attempts."