diff --git a/core/trunk/core/core_tables.php b/core/trunk/core/core_tables.php
index 7dd6088caec072426f6da4e1aa514639234ab544..74c86fafb491a1e16b28d9c0c8aa7f941c59845e 100644
--- a/core/trunk/core/core_tables.php
+++ b/core/trunk/core/core_tables.php
@@ -111,7 +111,7 @@ if (! defined('USERS_TABLE')) {
     define('USERS_TABLE', 'users');
 }
 if (! defined('EMAIL_SIGNATURES_TABLE')) {
-    define('EMAIL_SIGNATURES_TABLE', 'email_signatures');
+    define('EMAIL_SIGNATURES_TABLE', 'users_email_signatures');
 }
 if (! defined('USER_BASKETS_SECONDARY_TABLE')) {
     define('USER_BASKETS_SECONDARY_TABLE', 'user_baskets_secondary');
diff --git a/core/trunk/sql/160.sql b/core/trunk/sql/160.sql
index a4d9f9dc1b92bf593f4e317be521455e98eb6e82..e79fb4ee45edc0e4993b359d7f566fba705cf2b2 100644
--- a/core/trunk/sql/160.sql
+++ b/core/trunk/sql/160.sql
@@ -153,7 +153,7 @@ CREATE SEQUENCE email_signatures_id_seq
   START 7
   CACHE 1;
 
-CREATE TABLE email_signatures
+CREATE TABLE users_email_signatures
 (
   id bigint NOT NULL DEFAULT nextval('email_signatures_id_seq'::regclass),
   user_id character varying(255) NOT NULL,
diff --git a/core/trunk/sql/structure.sql b/core/trunk/sql/structure.sql
index ed8ee5f34f8a078534a6d7993e19ba038e9a03f6..b5554761044d063b49a7b7b35c90e68ce57343c0 100644
--- a/core/trunk/sql/structure.sql
+++ b/core/trunk/sql/structure.sql
@@ -921,7 +921,7 @@ CREATE SEQUENCE email_signatures_id_seq
   START 7
   CACHE 1;
 
-CREATE TABLE email_signatures
+CREATE TABLE users_email_signatures
 (
   id bigint NOT NULL DEFAULT nextval('email_signatures_id_seq'::regclass),
   user_id character varying(255) NOT NULL,