diff --git a/modules/path/path.module b/modules/path/path.module
index 6e08057d47902b352d96de9e0ee86c071ba5f23b..1fcc5b00041945c91fbb63a5543b448146dfec38 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -184,8 +184,23 @@ function path_set_alias($path = NULL, $alias = NULL, $pid = NULL) {
 function path_form($edit = '') {
   $form['#base'] = 'path_form';
 
-  $form['src'] = array('#type' => 'textfield', '#title' => t('Existing system path'), '#default_value' => $edit['src'], '#maxlength' => 64, '#description' => t('Specify the existing path you wish to alias. For example: node/28, forum/1, taxonomy/term/1+2.'));
-  $form['dst'] = array('#type' => 'textfield', '#default_value' => $edit['dst'], '#maxlength' => 64, '#description' => t('Specify an alternative path by which this data can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'));
+  $form['src'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Existing system path'),
+    '#default_value' => $edit['src'],
+    '#maxlength' => 64,
+    '#size' => 45,
+    '#description' => t('Specify the existing path you wish to alias. For example: node/28, forum/1, taxonomy/term/1+2.'),
+    '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
+  );
+  $form['dst'] = array(
+    '#type' => 'textfield',
+    '#default_value' => $edit['dst'],
+    '#maxlength' => 64,
+    '#size' => 45,
+    '#description' => t('Specify an alternative path by which this data can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'),
+    '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
+  );
 
   if ($edit['pid']) {
     $form['pid'] = array('#type' => 'hidden', '#value' => $edit['pid']);
diff --git a/modules/system/system.module b/modules/system/system.module
index ac6ae856bb04393a35814b7bc47d90ddf7abd8b6..4a9e79ecfe697edf7468e37f2e90c149a7c400af 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -548,7 +548,9 @@ function system_site_information_settings() {
     '#type' => 'textfield',
     '#title' => t('Default front page'),
     '#default_value' => variable_get('site_frontpage', 'node'),
-    '#description' => t('The home page displays content from this relative URL. If you are not using clean URLs, specify the part after "<code>?q=</code>". If unsure, specify "node".')
+    '#size' => 40,
+    '#description' => t('The home page displays content from this relative URL. If unsure, specify "node".'),
+    '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
   );
 
   return system_settings_form($form);
@@ -584,14 +586,18 @@ function system_error_reporting_settings() {
     '#type' => 'textfield',
     '#title' => t('Default 403 (access denied) page'),
     '#default_value' => variable_get('site_403', ''),
-    '#description' => t('This page is displayed when the requested document is denied to the current user. If you are not using clean URLs, specify the part after "<code>?q=</code>". If unsure, specify nothing.')
+    '#size' => 40,
+    '#description' => t('This page is displayed when the requested document is denied to the current user. If unsure, specify nothing.'),
+    '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
   );
 
   $form['site_404'] = array(
     '#type' => 'textfield',
     '#title' => t('Default 404 (not found) page'),
     '#default_value' =>  variable_get('site_404', ''),
-    '#description' => t('This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after "<code>?q=</code>". If unsure, specify nothing.')
+    '#size' => 40,
+    '#description' => t('This page is displayed when no other content matches the requested document. If unsure, specify nothing.'),
+    '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q=')
   );
 
   $form['error_level'] = array(