diff --git a/management/cli.py b/management/cli.py
index 115ed9f2..f3394cc0 100755
--- a/management/cli.py
+++ b/management/cli.py
@@ -93,10 +93,7 @@ elif sys.argv[1] == "user" and len(sys.argv) == 2:
 
 elif sys.argv[1] == "user" and sys.argv[2] in {"add", "password"}:
 	if len(sys.argv) < 5:
-		if len(sys.argv) < 4:
-			email = input("email: ")
-		else:
-			email = sys.argv[3]
+		email = input('email: ') if len(sys.argv) < 4 else sys.argv[3]
 		pw = read_password()
 	else:
 		email, pw = sys.argv[3:5]
@@ -110,10 +107,7 @@ elif sys.argv[1] == "user" and sys.argv[2] == "remove" and len(sys.argv) == 4:
 	print(mgmt("/mail/users/remove", { "email": sys.argv[3] }))
 
 elif sys.argv[1] == "user" and sys.argv[2] in {"make-admin", "remove-admin"} and len(sys.argv) == 4:
-	if sys.argv[2] == "make-admin":
-		action = "add"
-	else:
-		action = "remove"
+	action = 'add' if sys.argv[2] == 'make-admin' else 'remove'
 	print(mgmt("/mail/users/privileges/" + action, { "email": sys.argv[3], "privilege": "admin" }))
 
 elif sys.argv[1] == "user" and sys.argv[2] == "admins":
diff --git a/management/daemon.py b/management/daemon.py
index 026c2d6b..0e5b672b 100755
--- a/management/daemon.py
+++ b/management/daemon.py
@@ -751,10 +751,7 @@ def log_failed_login(request):
 	# During setup we call the management interface directly to determine the user
 	# status. So we can't always use X-Forwarded-For because during setup that header
 	# will not be present.
-	if request.headers.getlist("X-Forwarded-For"):
-		ip = request.headers.getlist("X-Forwarded-For")[0]
-	else:
-		ip = request.remote_addr
+	ip = request.headers.getlist("X-Forwarded-For")[0] if request.headers.getlist("X-Forwarded-For") else request.remote_addr
 
 	# We need to add a timestamp to the log message, otherwise /dev/log will eat the "duplicate"
 	# message.
diff --git a/management/dns_update.py b/management/dns_update.py
index e911135f..3b623302 100755
--- a/management/dns_update.py
+++ b/management/dns_update.py
@@ -861,10 +861,7 @@ def filter_custom_records(domain, custom_dns_iter):
 		# our short form (None => domain, or a relative QNAME) if
 		# domain is not None.
 		if domain is not None:
-			if qname == domain:
-				qname = None
-			else:
-				qname = qname[0:len(qname)-len("." + domain)]
+			qname = None if qname == domain else qname[0:len(qname) - len("." + domain)]
 
 		yield (qname, rtype, value)
 
@@ -1094,10 +1091,7 @@ def build_recommended_dns(env):
 
 		# expand qnames
 		for i in range(len(records)):
-			if records[i][0] == None:
-				qname = domain
-			else:
-				qname = records[i][0] + "." + domain
+			qname = domain if records[i][0] == None else records[i][0] + "." + domain
 
 			records[i] = {
 				"qname": qname,
diff --git a/management/mailconfig.py b/management/mailconfig.py
index ed06c242..787acd64 100755
--- a/management/mailconfig.py
+++ b/management/mailconfig.py
@@ -476,10 +476,7 @@ def add_mail_alias(address, forwards_to, permitted_senders, env, update_if_exist
 
 	forwards_to = ",".join(validated_forwards_to)
 
-	if len(validated_permitted_senders) == 0:
-		permitted_senders = None
-	else:
-		permitted_senders = ",".join(validated_permitted_senders)
+	permitted_senders = None if len(validated_permitted_senders) == 0 else ",".join(validated_permitted_senders)
 
 	conn, c = open_database(env, with_connection=True)
 	try: