Index: bakery.module
===================================================================
--- bakery.module	(revision 1645)
+++ bakery.module	(working copy)
@@ -109,7 +109,9 @@
  * Admin settings, see INSTALL.txt
  */
 function bakery_settings() {
-  $form = array();
+  $form = array(
+    '#submit' => array('bakery_settings_submit'),
+  );
 
   $form['bakery_is_master'] = array(
     '#type' => 'checkbox',
@@ -152,7 +154,27 @@
   return system_settings_form($form);
 }
 
+function bakery_settings_submit($form, &$form_state) {
+  db_query("DELETE FROM {url_alias} WHERE src = 'bakery' AND dst IN ('user/login', 'user/register')");
+  if (!$form_state['values']['bakery_is_master']) {
+    // Add URL aliases to bakery
+    $aliases = array(
+      array(
+        'src' => 'bakery',
+        'dst' => 'user/login',
+      ),
+      array(
+        'src' => 'bakery',
+        'dst' => 'user/register',
+      ),
+    );
+    foreach ($aliases as $alias) {
+      drupal_write_record('url_alias', $alias);
+    }
+  }
+}
 
+
 /**
  * Access callback for path /user.
  *