diff --git a/WebContent/base/OSRM.Map.js b/WebContent/base/OSRM.Map.js
index 6a298fc04..7e3df6823 100644
--- a/WebContent/base/OSRM.Map.js
+++ b/WebContent/base/OSRM.Map.js
@@ -89,13 +89,13 @@ click: function(e) {
 	if( !OSRM.G.markers.hasSource() ) {
 		var index = OSRM.G.markers.setSource( e.latlng );
 		OSRM.Geocoder.updateAddress( OSRM.C.SOURCE_LABEL, OSRM.C.DO_FALLBACK_TO_LAT_LNG );
-		OSRM.G.markers.route[index].show();
-		OSRM.Routing.getRoute();
+		OSRM.G.markers.route[index].show();		
+		OSRM.Routing.getRoute( {recenter:OSRM.G.markers.route.length == 2} );	// allow recentering when the route is first shown 
 	} else if( !OSRM.G.markers.hasTarget() ) {
 		var index = OSRM.G.markers.setTarget( e.latlng );
 		OSRM.Geocoder.updateAddress( OSRM.C.TARGET_LABEL, OSRM.C.DO_FALLBACK_TO_LAT_LNG );
 		OSRM.G.markers.route[index].show();
-		OSRM.Routing.getRoute();
+		OSRM.Routing.getRoute( {recenter:OSRM.G.markers.route.length == 2} );	// allow recentering when the route is first shown
 	}
 },
 geolocationResponse: function(response) {
diff --git a/WebContent/routing/OSRM.Routing.js b/WebContent/routing/OSRM.Routing.js
index b408a8df7..84166c2cc 100644
--- a/WebContent/routing/OSRM.Routing.js
+++ b/WebContent/routing/OSRM.Routing.js
@@ -54,7 +54,7 @@ timeoutRoute_Reversed: function() {
 	OSRM.G.markers.reverseMarkers();
 	OSRM.Routing.timeoutRoute();
 },
-showRoute: function(response) {
+showRoute: function(response, parameters) {
 	if(!response)
 		return;
 	
@@ -71,8 +71,10 @@ showRoute: function(response) {
 		OSRM.Routing._snapRoute();
 	}
 	OSRM.Routing._updateHints(response);
-	var bounds = new L.LatLngBounds( OSRM.G.route._current_route.getPositions() );
-	OSRM.G.map.setViewBoundsUI(bounds);	
+	if( parameters && parameters.recenter == true ) {		// allow recentering when the route is first shown
+		var bounds = new L.LatLngBounds( OSRM.G.route._current_route.getPositions() );
+		OSRM.G.map.setViewBoundsUI(bounds);
+	}
 },
 showRoute_Dragging: function(response) {
  	if(!response)
@@ -109,7 +111,7 @@ showRoute_Redraw: function(response) {
 //-- main function --
 
 //generate server calls to query routes
-getRoute: function() {
+getRoute: function(parameters) {
 	
 	// if source or target are not set -> hide route
 	if( OSRM.G.markers.route.length < 2 ) {
@@ -119,7 +121,7 @@ getRoute: function() {
 	OSRM.JSONP.clear('dragging');
 	OSRM.JSONP.clear('redraw');
 	OSRM.JSONP.clear('route');
-	OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=true', OSRM.Routing.showRoute, OSRM.Routing.timeoutRoute, OSRM.DEFAULTS.JSONP_TIMEOUT, 'route');
+	OSRM.JSONP.call(OSRM.Routing._buildCall()+'&instructions=true', OSRM.Routing.showRoute, OSRM.Routing.timeoutRoute, OSRM.DEFAULTS.JSONP_TIMEOUT, 'route', parameters);
 },
 getRoute_Reversed: function() {
 	if( OSRM.G.markers.route.length < 2 )