 		}
 		
 		private var _useWeaveExtensionWhenSavingToServer:Boolean;
+		private var _firstTimeSaveToServer:Boolean=true;
+		private var _previousFileNameStore:String;
 		private function saveSessionStateToServer(useWeaveExtension:Boolean):void
 		{
 			if (adminService == null)

	import weave.Weave;
	import weave.WeaveProperties;
	import weave.api.WeaveAPI;
	import weave.api.core.ILinkableObject;
	import weave.api.data.ICSVExportable;
	import weave.api.data.IDataSource;
	import weave.api.getCallbackCollection;
	import weave.api.reportError;
	import weave.api.ui.IVisTool;
	import weave.compiler.StandardLib;
	import weave.core.ExternalSessionStateInterface;

		{
			if (event.confirm)
			{
				_firstTimeSaveToServer=false;
				var fileName:String = event.textInput;
				fileName = Weave.fixWeaveFileName(fileName, _useWeaveExtensionWhenSavingToServer);
				_previousFileNameStore = fileName;
				
				var content:ByteArray;
				if (_useWeaveExtensionWhenSavingToServer)
