diff --git a/src/scripts/album.js b/src/scripts/album.js
index d598cd5..2236f48 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -423,7 +423,7 @@ album.setPublic = function(albumID, e) {
 
 		$('.basicModal .choice input[name="password"]').on('change', function() {
 
-			if ($(this).prop('checked')===true)	$('.basicModal .choice input[data-name="password"]').show();
+			if ($(this).prop('checked')===true)	$('.basicModal .choice input[data-name="password"]').show().focus();
 			else								$('.basicModal .choice input[data-name="password"]').hide();
 
 		});