diff --git a/client/views/settings/settings.coffee b/client/views/settings/settings.coffee
index e84c93a9baf..3d1edb0e685 100644
--- a/client/views/settings/settings.coffee
+++ b/client/views/settings/settings.coffee
@@ -23,16 +23,16 @@ Template.settings.helpers
 
 Template.settings.events
 
-	"click .submit": ->
+	"click .submit": (e, t) ->
 		group = FlowRouter.getParam('group')
 		settings = Settings.find({ group: group }).fetch()
 		updateSettings = []
 		for setting in settings
 			value = null
 			if setting.type is 'string'
-				value = _.trim($("input[name=#{setting._id}]").val())
-			else if setting.type is 'boolean' and $("input[name=#{setting._id}]:checked").length
-				value = if $("input[name=#{setting._id}]:checked").val() is "1" then true else false
+				value = _.trim(t.$("[name=#{setting._id}]").val())
+			else if setting.type is 'boolean' and t.$("[name=#{setting._id}]:checked").length
+				value = if t.$("[name=#{setting._id}]:checked").val() is "1" then true else false
 
 			if value?
 				updateSettings.push { _id: setting._id, value: value }
diff --git a/client/views/settings/settings.html b/client/views/settings/settings.html
index fc15dcf5a45..8e61a5dd69f 100644
--- a/client/views/settings/settings.html
+++ b/client/views/settings/settings.html
@@ -23,7 +23,11 @@
 								<div class="input-line double-col">
 									<label>{{label}}</label>
 									<div>
-										<input type="text" name="{{_id}}" value="{{value}}" />
+										{{#if multiline}}
+											<textarea name="{{_id}}" rows="4" style="height: auto">{{value}}</textarea>
+										{{else}}
+											<input type="text" name="{{_id}}" value="{{value}}" />
+										{{/if}}
 									</div>
 								</div>
 							{{/if}}