 			
 			_useWeaveExtensionWhenSavingToServer = useWeaveExtension;
 			
-			var fileName:String = getFlashVarFile().split("/").pop();
+			var fileName:String = _previousSavedFileName || getFlashVarFile().split("/").pop();
 			fileName = Weave.fixWeaveFileName(fileName, _useWeaveExtensionWhenSavingToServer);
-			if (!_firstTimeSaveToServer)
-				fileName=_previousFileNameStore;
 			
 			var fileSaveDialogBox:AlertTextBox;
 			fileSaveDialogBox = PopUpManager.createPopUp(this,AlertTextBox) as AlertTextBox;

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

		}
		
		private var _useWeaveExtensionWhenSavingToServer:Boolean;
		private var _previousSavedFileName:String;
		private function saveSessionStateToServer(useWeaveExtension:Boolean):void
		{
			if (adminService == null)
