diff --git a/build/utils.sh b/build/utils.sh
index 470cb24..37f328e 100755
--- a/build/utils.sh
+++ b/build/utils.sh
@@ -48,7 +48,7 @@ do_build() {
 do_install() {
 	[[ -e "${DESTDIR}" ]] || mkdir -p "${DESTDIR}"
 	find "${INSTALL_ROOT}" -type f -name '.git*' -delete
-	find "${INSTALL_ROOT}" -type d -name '.tx' -delete
+	rm-rf "${INSTALL_ROOT}/usr/share/web-greeter/themes/default/.tx"
 	cp -R "${INSTALL_ROOT}"/* "${DESTDIR}"
 }
 
diff --git a/themes/default/js/greeter.js b/themes/default/js/greeter.js
index 33be030..1bb350b 100644
--- a/themes/default/js/greeter.js
+++ b/themes/default/js/greeter.js
@@ -651,6 +651,7 @@ class Theme {
 
 		$( '#session-list' ).removeClass( 'hidden' ).show();
 		$( '#passwordArea' ).show();
+		$('#passwordField').focus();
 		$( '.dropdown-toggle' ).dropdown();
 
 		this.auth_pending = true;