diff --git a/xos/services/vpn/admin.py b/xos/services/vpn/admin.py
index 9104168..1b780a4 100644
--- a/xos/services/vpn/admin.py
+++ b/xos/services/vpn/admin.py
@@ -100,7 +100,8 @@
         self.instance.can_view_subnet = self.cleaned_data.get(
             'can_view_subnet')
 
-        self.instance.script_name = "hell"
+        if (not self.instance.script):
+            self.instance.script = str(time.time()) + ".vpn"
 
         if (not self.instance.server_key):
             self.instance.server_key = self.generate_VPN_key()
diff --git a/xos/services/vpn/models.py b/xos/services/vpn/models.py
index a26fcae..aa63dde 100644
--- a/xos/services/vpn/models.py
+++ b/xos/services/vpn/models.py
@@ -139,7 +139,7 @@
     @property
     def script(self):
         """string: The file name of the client script"""
-        self.get_attribute("script", self.default_attributes['script'])
+        return self.get_attribute("script", self.default_attributes['script'])
 
     @script.setter
     def script(self, value):