diff --git a/services/univention-ldb-modules/ucs-school-create_windows_computer b/services/univention-ldb-modules/ucs-school-create_windows_computer
index b731d18..f9f4cb2 100755
--- a/services/univention-ldb-modules/ucs-school-create_windows_computer
+++ b/services/univention-ldb-modules/ucs-school-create_windows_computer
@@ -1,6 +1,65 @@
-#!/bin/sh
-samba4_addmachine=$(/usr/sbin/univention-config-registry get "samba4/addmachine")
-/usr/bin/test "$samba4_addmachine" = "deny" && exit 2
-/usr/sbin/umc-command "$@" || exit 1
-/usr/bin/test "$samba4_addmachine" = "dummy" && exit 3
-exit 0
+#!/usr/bin/python2.7
+# -*- coding: utf-8 -*-
+#
+# Copyright 2016 Univention GmbH
+#
+# http://www.univention.de/
+#
+# All rights reserved.
+#
+# The source code of this program is made available
+# under the terms of the GNU Affero General Public License version 3
+# (GNU AGPL V3) as published by the Free Software Foundation.
+#
+# Binary versions of this program provided by Univention to you as
+# well as other copyrighted, protected or trademarked materials like
+# Logos, graphics, fonts, specific documentations and configurations,
+# cryptographic keys etc. are subject to a license agreement between
+# you and Univention and not subject to the GNU AGPL V3.
+#
+# In the case you use this program under the terms of the GNU AGPL V3,
+# the program is provided in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License with the Debian GNU/Linux or Univention distribution in file
+# /usr/share/common-licenses/AGPL-3; if not, see
+# <http://www.gnu.org/licenses/>.
+
+import sys
+from argparse import ArgumentParser
+
+import univention.config_registry
+from univention.lib.umc_connection import UMCConnection
+from ucsschool.lib.schoolldap import SchoolSearchBase
+
+ucr = univention.config_registry.ConfigRegistry()
+ucr.load()
+
+
+def main():
+	samba4_addmachine = ucr.get('samba4/addmachine')
+	if samba4_addmachine == 'deny':
+		sys.exit(2)
+
+	parser = ArgumentParser()
+	parser.add_argument('-s', dest='server')
+	parser.add_argument('-P', dest='password')
+	parser.add_argument('-U', dest='username')
+	parser.add_argument('-o', action='append', dest='options')
+	parser.add_argument('command')
+	args = parser.parse_args()
+
+	options = dict(x.split('=', 1) for x in args.options)
+	options['school'] = SchoolSearchBase.getOU(ucr.get('ldap/hostdn', '')) or SchoolSearchBase.getOU(ucr.get('dhcpd/ldap/base', ''))
+	connection = UMCConnection(args.server, args.username, args.password)
+	connection.request(args.command, options)
+
+	if samba4_addmachine == 'dummy':
+		sys.exit(3)
+
+
+if __name__ == '__main__':
+	main()