diff --git a/application/config/database.php b/application/config/database.php
index 0e9d6ab..1ba1109 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -46,23 +46,23 @@
 */
 $db = array();
 $active_group = 'default';
-$active_record = TRUE;
+$active_record = true;
 
 $db['default']['hostname'] = 'localhost';
 $db['default']['username'] = '';
 $db['default']['password'] = '';
 $db['default']['database'] = 'ekokumppanit';
 $db['default']['dbdriver'] = 'mysql';
-$db['default']['dbprefix'] = 'ystavakyla_';
-$db['default']['pconnect'] = TRUE;
-$db['default']['db_debug'] = TRUE;
-$db['default']['cache_on'] = FALSE;
+$db['default']['dbprefix'] = 'ystavakyla_ecards__';
+$db['default']['pconnect'] = true;
+$db['default']['db_debug'] = true;
+$db['default']['cache_on'] = false;
 $db['default']['cachedir'] = '';
 $db['default']['char_set'] = 'utf8';
 $db['default']['dbcollat'] = 'utf8_general_ci';
 $db['default']['swap_pre'] = '';
-$db['default']['autoinit'] = TRUE;
-$db['default']['stricton'] = FALSE;
+$db['default']['autoinit'] = true;
+$db['default']['stricton'] = false;
 
 
 /* End of file database.php */
diff --git a/tables.sql b/tables.sql
index 2c34d8a..4777eed 100644
--- a/tables.sql
+++ b/tables.sql
@@ -1,7 +1,7 @@
 SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 SET time_zone = "+00:00";
 
-CREATE TABLE `ystavakyla_ecards` (
+CREATE TABLE IF NOT EXISTS `ystavakyla_ecards__ecards` (
   `id` int(55) NOT NULL AUTO_INCREMENT,
   `created_at` timestamp NULL DEFAULT NULL,
   `updated_at` timestamp NULL DEFAULT NULL,
@@ -33,7 +33,7 @@ CREATE TABLE `ystavakyla_ecards` (
   KEY `card_status` (`card_status`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
-CREATE TABLE `ystavakyla_users` (
+CREATE TABLE IF NOT EXISTS `ystavakyla_ecards__users` (
   `id` int(55) NOT NULL AUTO_INCREMENT,
   `username` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
   `password` varchar(40) CHARACTER SET utf8 DEFAULT NULL,