diff --git a/MasterPassword/C/mpw.bashrc b/MasterPassword/C/mpw.bashrc
index 4fb71d11..a03c4c7c 100644
--- a/MasterPassword/C/mpw.bashrc
+++ b/MasterPassword/C/mpw.bashrc
@@ -5,7 +5,7 @@ mpw() {
         if hash pbcopy 2>/dev/null; then
             pbcopy
         elif hash xclip 2>/dev/null; then
-            xclip
+            xclip -selection clip
         else
             cat; echo 2>/dev/null
             return
diff --git a/MasterPassword/C/mpw_tests.xml b/MasterPassword/C/mpw_tests.xml
index 8fb4c0a1..3a238932 120000
--- a/MasterPassword/C/mpw_tests.xml
+++ b/MasterPassword/C/mpw_tests.xml
@@ -1 +1 @@
-../Java/masterpassword-algorithm/src/test/resources/mpw_tests.xml
\ No newline at end of file
+../Java/masterpassword-tests/src/main/resources/mpw_tests.xml
\ No newline at end of file
diff --git a/MasterPassword/Web/js/main.js b/MasterPassword/Web/js/main.js
index 535d1cc9..d65a2f46 100644
--- a/MasterPassword/Web/js/main.js
+++ b/MasterPassword/Web/js/main.js
@@ -31,8 +31,10 @@ function update(working) {
         if (!working)
             $('#userName').focus();
     }
-    else
+    else {
         $('#identity').removeClass('active');
+        $('#userName')[0].value = $('#masterPassword')[0].value = '';
+    }
 
     if (screen == 'site') {
         $('#site').addClass('active');
@@ -40,16 +42,16 @@ function update(working) {
         if (!working)
             $('#siteName').focus();
     }
-    else
+    else {
         $('#site').removeClass('active');
+        $('#siteName')[0].value = $('#sitePassword')[0].value = '';
+    }
 
     // Working
     if (working && screen == 'identity')
         $('#identity').addClass('working').find('input, select').attr('disabled', 'disabled');
-    else {
-        $('#userName')[0].value = $('#masterPassword')[0].value = '';
+    else
         $('#identity').removeClass('working').find('input, select').removeAttr('disabled');
-    }
 
     if (working && screen == 'site')
         $('#site').addClass('working');