diff --git a/tperimeter.py b/tperimeter.py
index 699def1..bd4b6c9 100644
--- a/tperimeter.py
+++ b/tperimeter.py
@@ -1,12 +1,12 @@
 #!/usr/local/bin/python
 # tperimeter.py
-# Copyright (c) 2006 TundraWare Inc.  All Rights Reserved.
+# Copyright (c) 2006-2008 TundraWare Inc.  All Rights Reserved.
 # For Updates See:  http://www.tundraware.com/Software/tperimeter
 
 # Program Information
 
 PROGNAME = "tperimeter.py"
-RCSID = "$Id: tperimeter.py,v 1.110 2006/09/25 19:56:37 tundra Exp $"
+RCSID = "$Id: tperimeter.py,v 1.111 2008/06/24 19:20:12 tundra Exp $"
 
 import os, re, sys, syslog
 
@@ -24,7 +24,7 @@
 
 Forbidden = ["0.0.0.0", "255.255.255.255"]    # Forbidden IP addresses
 Services  = ["sshd"]                          # Services we can open up
-
+DefSvc    = "sshd"                            # Default service to open if none specified
 
 #####
 # Print Routine
@@ -70,18 +70,24 @@
 # Validate Number And Content Of Passed Parameters
 #####
 
-# Make sure both parameters were passed
+# If no service passed explicitly, use default
 
-if not (service and address):
-    Error("You Must Specify Both A Service Name And Address")
+if not service:
+    service = DefSvc
 
 
 # Make sure requested service is one of the ones allowed
 
-elif service not in Services:
+if service not in Services:
     Error("You Are Not Permitted To Change Access To %s" % service)
 
 
+# If no address passed explictly, use the requestor's
+
+if not address:
+    address = requestor
+
+
 # Make sure address is in quad format
 
 if not re.match(IPQuad, address):