diff --git a/upload/admin/admin_terms.php b/upload/admin/admin_terms.php
new file mode 100644
index 000000000..a7847e461
--- /dev/null
+++ b/upload/admin/admin_terms.php
@@ -0,0 +1,32 @@
+<?php
+
+if (!empty($setmodules)) {
+    $module['GENERAL']['TERMS'] = basename(__FILE__);
+    return;
+}
+
+require('./pagestart.php');
+require(INC_DIR . 'bbcode.php');
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+    bb_update_config(array(TERMS_KEY => $_POST['message']));
+}
+
+$message = '';
+$sql = "SELECT config_value FROM " . BB_CONFIG . " WHERE config_name='" . TERMS_KEY . "'";
+
+if ($result = DB()->sql_query($sql)) {
+    $row = DB()->sql_fetchrow($result);
+    $message = $row['config_value'];
+}
+
+$template->assign_vars(array(
+    'S_CONFIG_ACTION' => 'admin_terms.php',
+    'CONFIG' => true,
+    'MESSAGE' => $message,
+    'EXT_LINK_NEW_WIN' => $bb_cfg['ext_link_new_win'],
+    'PREVIEW_HTML' => (isset($_REQUEST['preview'])) ? bbcode2html($message) : ''
+
+));
+
+print_page('admin_terms.tpl', 'admin');
\ No newline at end of file
diff --git a/upload/common.php b/upload/common.php
index 42ca82e41..1967d5ffc 100644
--- a/upload/common.php
+++ b/upload/common.php
@@ -48,6 +48,8 @@ define('TOR_TYPE_SILVER',     2);
 define('GUEST_UID', -1);
 define('BOT_UID',   -746);
 
+define('TERMS_KEY', 'terms');
+
 // DBS
 class DBS
 {
diff --git a/upload/config.php b/upload/config.php
index 3de83cea6..648bc3088 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -600,7 +600,7 @@ $banned_user_agents = array(
 $bb_cfg['trash_forum_id'] = 0; // (int) 7
 
 $bb_cfg['first_logon_redirect_url'] = 'index.php';
-$bb_cfg['terms_and_conditions_url'] = 'index.php';
+$bb_cfg['terms_and_conditions_url'] = 'terms.php';
 
 $bb_cfg['user_agreement_url']       = 'misc.php?do=info&show=user_agreement';
 $bb_cfg['copyright_holders_url']    = 'misc.php?do=info&show=copyright_holders';
diff --git a/upload/language/en/main.php b/upload/language/en/main.php
index 95263429f..1cc156aed 100644
--- a/upload/language/en/main.php
+++ b/upload/language/en/main.php
@@ -2877,4 +2877,6 @@ $lang['ATOM_NO_FORUM'] = 'This forum does not have a feed (no ongoing topics)';
 $lang['ATOM_NO_USER'] = 'This user does not have a feed (no ongoing topics)';
 
 $lang['HASH_INVALID'] = 'Hash %s is invalid';
-$lang['HASH_NOT_FOUND'] = 'Release with hash %s not found';
\ No newline at end of file
+$lang['HASH_NOT_FOUND'] = 'Release with hash %s not found';
+
+$lang['TERMS_ADMIN_EMPTY_TEXT'] = '[align=center]The text of this page is edited at [url]http://%s/admin/admin_terms.php[/url][/align]';
\ No newline at end of file
diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php
index 5cb40e2e3..68a55fa13 100644
--- a/upload/language/ru/main.php
+++ b/upload/language/ru/main.php
@@ -2877,4 +2877,6 @@ $lang['ATOM_NO_FORUM'] = 'Для этого форума нет ленты (не
 $lang['ATOM_NO_USER'] = 'Для этого пользователя нет ленты (нет начатых тем)';
 
 $lang['HASH_INVALID'] = 'Хэш %s некорректен';
-$lang['HASH_NOT_FOUND'] = 'Раздача с хэшем %s не найдена';
\ No newline at end of file
+$lang['HASH_NOT_FOUND'] = 'Раздача с хэшем %s не найдена';
+
+$lang['TERMS_ADMIN_EMPTY_TEXT'] = '[align=center]Текст этой страницы редактируется по адресу [url]http://%s/admin/admin_terms.php[/url][/align]';
\ No newline at end of file
diff --git a/upload/language/uk/main.php b/upload/language/uk/main.php
index b9ea61065..121aea388 100644
--- a/upload/language/uk/main.php
+++ b/upload/language/uk/main.php
@@ -2877,4 +2877,6 @@ $lang['ATOM_NO_FORUM'] = 'Для цього форуму немає стрічк
 $lang['ATOM_NO_USER'] = 'Для цього користувача немає стрічки (немає початих тем)';
 
 $lang['HASH_INVALID'] = 'Хеш %s некоректний';
-$lang['HASH_NOT_FOUND'] = 'Роздача з хешем %s не знайдено';
\ No newline at end of file
+$lang['HASH_NOT_FOUND'] = 'Роздача з хешем %s не знайдено';
+
+$lang['TERMS_ADMIN_EMPTY_TEXT'] = '[align=center]Текст цієї сторінки редагується за адресою [url]http://%s/admin/admin_terms.php[/url][/align]';
\ No newline at end of file
diff --git a/upload/templates/admin/admin_terms.tpl b/upload/templates/admin/admin_terms.tpl
new file mode 100644
index 000000000..cc73c5edf
--- /dev/null
+++ b/upload/templates/admin/admin_terms.tpl
@@ -0,0 +1,25 @@
+<script type="text/javascript" src="/misc/js/bbcode.js"></script>
+<script type="text/javascript">
+    var ExternalLinks_InNewWindow = '{EXT_LINK_NEW_WIN}';
+    var hidePostImg = false;
+</script>
+
+<form action="{S_CONFIG_ACTION}" method="post">
+    <table class="forumline">
+        <tr>
+            <th>{L_TERMS}</th>
+        </tr>
+        <tr id="view_message"<!-- IF not PREVIEW_HTML --> class="hidden"<!-- ENDIF -->>
+            <td class="row1">
+                <div class="view-message">{PREVIEW_HTML}</div>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <!-- INCLUDE posting_editor.tpl -->
+            </td>
+        </tr>
+    </table>
+</form>
+
+<br clear="all"/>
\ No newline at end of file
diff --git a/upload/templates/default/terms.tpl b/upload/templates/default/terms.tpl
new file mode 100644
index 000000000..69601d17f
--- /dev/null
+++ b/upload/templates/default/terms.tpl
@@ -0,0 +1,10 @@
+<table class="forumline">
+    <tr>
+        <th>{L_TERMS}</th>
+    </tr>
+    <tr>
+        <td class="row1">
+            {TERMS_HTML}
+        </td>
+    </tr>
+</table>
\ No newline at end of file
diff --git a/upload/terms.php b/upload/terms.php
new file mode 100644
index 000000000..891de4c4c
--- /dev/null
+++ b/upload/terms.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * User: dimka3210
+ * Date: 30.08.14
+ * Time: 15:15
+ */
+
+define('BB_ROOT', './');
+require(BB_ROOT . 'common.php');
+require(INC_DIR . 'bbcode.php');
+
+$user->session_start();
+
+$message = '';
+$sql = "SELECT config_value FROM " . BB_CONFIG . " WHERE config_name='" . TERMS_KEY . "'";
+
+if ($result = DB()->sql_query($sql)) {
+    $row = DB()->sql_fetchrow($result);
+    $message = $row['config_value'];
+}
+
+if (!$message && IS_ADMIN) {
+    $message = sprintf($lang['TERMS_ADMIN_EMPTY_TEXT'], $domain_name);
+} elseif (!$message) {
+    redirect('/');
+}
+
+$template->assign_vars(array(
+    'TERMS_HTML' => bbcode2html($message)
+));
+
+print_page('terms.tpl');
\ No newline at end of file