diff --git a/apps/files_sharing/js/authenticate.js b/apps/files_sharing/js/authenticate.js
new file mode 100644
index 0000000000..7f3f0d0a7d
--- /dev/null
+++ b/apps/files_sharing/js/authenticate.js
@@ -0,0 +1,9 @@
+$(document).ready(function(){
+ 	$('#password').on('keyup input change', function() {
+		if ($('#password').val().length > 0) {
+			$('#password-submit').prop('disabled', false);
+		} else {
+			$('#password-submit').prop('disabled', true);
+		}
+	});
+});
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 72adf0d167..909e839177 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -2,6 +2,7 @@
 	/** @var $_ array */
 	/** @var $l OC_L10N */
 	style('files_sharing', 'authenticate');
+	script('files_sharing', 'authenticate'); 
 ?>
 <form method="post">
 	<fieldset>
@@ -18,8 +19,8 @@
 				placeholder="<?php p($l->t('Password')); ?>" value=""
 				autocomplete="off" autocapitalize="off" autocorrect="off"
 				autofocus />
-			<input type="submit" value=""
-				class="svg icon-confirm input-button-inline" />
+			<input type="submit" id="password-submit" 
+				class="svg icon-confirm input-button-inline" value="" disabled="disabled" />
 		</p>
 	</fieldset>
 </form>