diff --git a/.gitignore b/.gitignore
index 4ac6397..83821de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 # Vaadin cache dir
 /src/main/webapp/VAADIN/gwt-unitCache
 /src/main/webapp/VAADIN/widgetsets
+/target
diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index 9451ef4..b97d43e 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -811,7 +811,7 @@ $scope.LaunchLimes = function(){
 	$scope.save = function(){
 			
 		var parameters = { 
-        endpoint: ConfigurationService.getSPARQLEndpoint() , 
+        endpoint: AccountService.getUsername() == null ? ConfigurationService.getPublicSPARQLEndpoint() : ConfigurationService.getSPARQLEndpoint(),
    		uriBase : ConfigurationService.getUriBase()
 		};
 				
@@ -1536,7 +1536,7 @@ var GeoliftCtrl = function($scope, $http, ConfigurationService, flash, ServerErr
 		
 		var parameters = {
 	    rdfFile: "result.ttl", 
-	    endpoint: ConfigurationService.getSPARQLEndpoint(), 
+	    endpoint: AccountService.getUsername()== null ? ConfigurationService.getPublicSPARQLEndpoint() : ConfigurationService.getSPARQLEndpoint(),
 	    graph: $scope.saveDataset.replace(':', ConfigurationService.getUriBase()), 
 	    uriBase : ConfigurationService.getUriBase(),
         username: AccountService.getUsername()
@@ -2107,7 +2107,7 @@ var TripleGeoCtrl = function($scope, $http, ConfigurationService, flash, ServerE
 		var parameters = {
 		        rdfFile: "result."+fileType,
 		        fileType: fileType,
-		        endpoint: ConfigurationService.getSPARQLEndpoint() , 
+		        endpoint: AccountService.getUsername()==null ? ConfigurationService.getPublicSPARQLEndpoint() : ConfigurationService.getSPARQLEndpoint(),
 		        graph: $scope.saveDataset.replace(':', ConfigurationService.getUriBase()), 
 		        uriBase : ConfigurationService.getUriBase(),
 		        username: AccountService.getUsername()