diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index e27d44653..515ed58ba 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -5103,10 +5103,13 @@ int slsDetector::loadSettingsFile(string fname, int imod) {
   for (int im=mmin; im<mmax; im++) {
     ostringstream ostfn;
     ostfn << fname;
-    if (fname.find(".sn")==string::npos && fname.find(".trim")==string::npos) {
+    if (fname.find(".sn")==string::npos && fname.find(".trim")==string::npos && fname.find(".settings")==string::npos) {
       ostfn << ".sn"  << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im); 
       fn=ostfn.str();
     }
+    //settings is saved in myMod.reg for gotthard
+    if(thisDetector->myDetectorType==GOTTHARD)
+	  myMod->reg=thisDetector->currentSettings;
     myMod=readSettingsFile(fn, thisDetector->myDetectorType);
     if (myMod) {
       myMod->module=im;
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o b/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o
index b8f022cf9..0bc7d3b3d 100644
Binary files a/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o and b/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o differ
diff --git a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
index 455ca9908..c69b52b1e 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
+++ b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp
@@ -271,10 +271,6 @@ int energyConversion::writeSettingsFile(string fname, detectorType myDetectorTyp
     names[id++]="Vin";
     names[id++]="Vref_comp";
     names[id++]="Vib_test";
-    names[id++]="config";
-    names[id++]="HV"; 
-    names[id++]="macaddress";
-    names[id++]="ipaddress";
     break;
   default:
     cout << "Unknown detector type - unknown format for settings file" << endl;