diff --git a/debian/changelog b/debian/changelog
index 840bb79b..ed3512df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ byobu (4.23) unreleased; urgency=low
     - reuse the get_network_interface function across network operations
   * usr/lib/byobu/updates_available:
     - support package kit, LP: #815579
+  * usr/bin/byobu-config, usr/bin/byobu-select-session:
+    - use python's default parameter for os.getenv(), LP: #816026
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 24 Jul 2011 14:23:38 -0500
 
diff --git a/usr/bin/byobu-config b/usr/bin/byobu-config
index a19395a1..52aa7d60 100755
--- a/usr/bin/byobu-config
+++ b/usr/bin/byobu-config
@@ -29,13 +29,10 @@ from snack import *
 PKG="byobu"
 HOME=os.getenv("HOME")
 USER=os.getenv("USER")
-BYOBU_CONFIG_DIR=os.getenv("BYOBU_CONFIG_DIR")
-BYOBU_BACKEND=os.getenv("BYOBU_BACKEND")
-SOCKETDIR=os.getenv("SOCKETDIR")
-if os.getenv("BYOBU_PREFIX"):
-    PREFIX = os.getenv("BYOBU_PREFIX")
-else:
-    PREFIX = "/usr"
+BYOBU_CONFIG_DIR=os.getenv("BYOBU_CONFIG_DIR", HOME+"/.byobu")
+BYOBU_BACKEND=os.getenv("BYOBU_BACKEND", "screen")
+SOCKETDIR=os.getenv("SOCKETDIR", "/var/run/screen")
+PREFIX = os.getenv("BYOBU_PREFIX", "/usr")
 SHARE=PREFIX+'/share/'+PKG
 DOC=PREFIX+'/share/doc/'+PKG
 if not os.path.exists(SHARE):
diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session
index fdd5ea60..0310fac2 100755
--- a/usr/bin/byobu-select-session
+++ b/usr/bin/byobu-select-session
@@ -23,8 +23,8 @@ import commands, os, re, sys
 PKG = "byobu"
 SHELL = os.getenv("SHELL", "/bin/bash")
 HOME=os.getenv("HOME")
-BYOBU_CONFIG_DIR=os.getenv("BYOBU_CONFIG_DIR")
-BYOBU_BACKEND=os.getenv("BYOBU_BACKEND")
+BYOBU_CONFIG_DIR=os.getenv("BYOBU_CONFIG_DIR", HOME+"/.byobu")
+BYOBU_BACKEND=os.getenv("BYOBU_BACKEND", "screen")
 choice = ""
 sessions = []
 text = []