diff --git a/osmo-cn-latest/create_hlr.py b/osmo-cn-latest/create_hlr.py
index b754af7a..0a625a99 100755
--- a/osmo-cn-latest/create_hlr.py
+++ b/osmo-cn-latest/create_hlr.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import os, sys
 import csv
 import sys
 import sqlite3
@@ -127,7 +128,22 @@ def main():
         infilename = args[0]
 	csvfields = ['name', 'iccid', 'mcc', 'mnc', 'imsi', 'extension', 'smsp', 'ki', 'opc', 'adm1']
 
-	create_hlr_3g("hlr.db")
+        try:
+            create_hlr_3g("hlr.db")
+        except sqlite3.OperationalError:
+            print("hlr.db already exists, please remove!\n");
+            sys.exit(1)
+
+        msc = open("osmo-msc.cfg.patch", "w")
+        msc.write("network\n")
+        msc.write(" network country code %s\n" %(options.mcc))
+        msc.write(" mobile network code %s\n" %(options.mnc))
+        msc.write(" short name OsmoMSC-%s-%s\n" %(options.mcc, options.mnc))
+        msc.write(" long name OsmoMSC-%s-%s\n" %(options.mcc, options.mnc))
+        msc.close()
+
+        os.system("osmo-config-merge osmo-msc.cfg.base osmo-msc.cfg.patch > osmo-msc.cfg")
+
 	inf = open(infilename, "r")
 	outf = open("simcards.csv", "w")
 
diff --git a/osmo-cn-latest/osmo-msc.cfg b/osmo-cn-latest/osmo-msc.cfg.base
similarity index 78%
rename from osmo-cn-latest/osmo-msc.cfg
rename to osmo-cn-latest/osmo-msc.cfg.base
index 8924d1e2..042d8477 100644
--- a/osmo-cn-latest/osmo-msc.cfg
+++ b/osmo-cn-latest/osmo-msc.cfg.base
@@ -2,11 +2,11 @@
 ! OsmoMSC configuration saved from vty
 !
 log file /data/osmo-msc.log
-  logging filter all 1
-  logging color 1
-  logging print category 1
-  logging timestamp 0
-  logging level all everything
+ logging filter all 1
+ logging color 1
+ logging print category 1
+ logging timestamp 0
+ logging level all everything
 !
 line vty
  no login