diff --git a/manifest b/manifest
index 008578f..84cc962 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fall\sback\sto\stextual\sdiff\swhen\sgdiff\sfails\nFossil\sExe\spath\sneeds\sto\sbe\sset\sbefore\sapplySettings
-D 2015-07-29T09:09:14.938
+C Fixed\sissue\swith\sFossil's\sdefault\sremote-url\swith\spassword\spreventing\scommits
+D 2015-07-29T09:20:59.161
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -226,7 +226,7 @@ F src/FslSettingsDialog.cpp 2531d3709f0eab66651671e3edead2ca720d07d5
 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp 4743ac0f46549349d8b47bbbcdf83660103d88e8
+F src/MainWindow.cpp b6c43a8aed7eac9f9e785b4d90e222f125434515
 F src/MainWindow.h c4518a0ba8d5ba2a128449bd8a50adff8402049d
 F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac
 F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
@@ -254,7 +254,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043
 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d
-P c9ad2689d2d946996f03dbdd62016a33cb7ef4a4
-R 10ad14ef2154a69d58d259e9fd307af2
+P a9115a3369a7897bfc665f2a9614f61dbec80493
+R 0b86dfc90894774cb210e244de86ff36
 U Kostas
-Z 51e6c7e69b22e2696b997fe00a51cecc
+Z 23676bb827ec6890b4c74e5d68d03e04
diff --git a/manifest.uuid b/manifest.uuid
index f417052..44bdd09 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a9115a3369a7897bfc665f2a9614f61dbec80493
\ No newline at end of file
+c16b5a89043d313fdee1e645edf9d2d3f1600d0f
\ No newline at end of file
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 18c7523..07a1f1c 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -2756,10 +2756,14 @@ void MainWindow::on_actionSetDefaultRemote_triggered()
 
 	if(getWorkspace().setRemoteDefault(url))
 	{
-		// FIXME: Fossil currently ignores the password
 		if(!url.isLocalFile())
 			KeychainGet(this, url, *settings.GetStore());
-		fossil().setRemoteUrl(url);
+
+		// FIXME: Fossil currently ignores the password in "remote-url"
+		// which breaks commits due to a missing password when autosync is enabled
+		// so only set the remote url when there is no password set
+		if(url.password().isEmpty())
+			fossil().setRemoteUrl(url);
 	}
 
 	updateWorkspaceView();