diff --git a/roles/abrt/faf/defaults/main.yml b/roles/abrt/faf/defaults/main.yml
index a45fc88115..db48406fbe 100644
--- a/roles/abrt/faf/defaults/main.yml
+++ b/roles/abrt/faf/defaults/main.yml
@@ -13,10 +13,6 @@ memcached_port: 11211
 # driver://user:password@host:port/database
 faf_db_connectstring: postgresql:///faf
 
-# set to true if this is the very first run of this playbook
-# it will set-up postgresql database and initial data for faf
-faf_first_time_setup: false
-
 # dangerous, delete and re-create PostgreSQL database
 # (will wipe Postgre's data dir and re-create from scratch)
 faf_recreate_database: false
@@ -119,7 +115,6 @@ faf_problem_packages:
 faf_opsys_packages:
   - faf-opsys-centos
   - faf-opsys-fedora
-#  - faf-opsys-rhel
 
 faf_action_packages:
   - faf-action-add-compat-hashes
@@ -130,6 +125,7 @@ faf_action_packages:
   - faf-action-c2p
   - faf-action-cleanup-task-results
   - faf-action-create-problems
+  - faf-action-delete-invalid-ureports
   - faf-action-external-faf
   - faf-action-external-faf-clone-bz
   - faf-action-find-components
diff --git a/roles/abrt/faf/meta/.galaxy_install_info b/roles/abrt/faf/meta/.galaxy_install_info
index 48bffdd867..38b53ae720 100644
--- a/roles/abrt/faf/meta/.galaxy_install_info
+++ b/roles/abrt/faf/meta/.galaxy_install_info
@@ -1 +1 @@
-{install_date: 'Thu Mar 23 14:13:24 2017', version: ''}
+{install_date: 'Thu Apr  6 13:39:53 2017', version: ''}
diff --git a/roles/abrt/faf/tasks/first_time_setup.yml b/roles/abrt/faf/tasks/first_time_setup.yml
index 7360bc4711..40e697abac 100644
--- a/roles/abrt/faf/tasks/first_time_setup.yml
+++ b/roles/abrt/faf/tasks/first_time_setup.yml
@@ -1,16 +1,26 @@
 ---
 
-- name: create faf's database schema
-  command: faf-migrate-db --create-all
+- name: check for count of faf tables
+  shell: psql -c "SELECT COUNT(*) FROM pg_stat_user_tables"
+  register: count_tables
+  changed_when: "( count_tables.stdout_lines[2]|int ) == 0"
   become: yes
   become_user: faf
 
-- name: stamp database as migrated to latest version
-  command: faf-migrate-db --stamp-only
-  become: yes
-  become_user: faf
+# Skip whole block if faf owns atleast 1 table in db
+- block:
+  - name: create faf's database schema
+    command: faf-migrate-db --create-all
+    become: yes
+    become_user: faf
 
-- name: init faf
-  command: faf init
-  become: yes
-  become_user: faf
+  - name: stamp database as migrated to latest version
+    command: faf-migrate-db --stamp-only
+    become: yes
+    become_user: faf
+
+  - name: init faf
+    command: faf init
+    become: yes
+    become_user: faf
+  when: ( count_tables.stdout_lines[2]|int ) == 0
diff --git a/roles/abrt/faf/tasks/main.yml b/roles/abrt/faf/tasks/main.yml
index 9b7d82e2c7..ef3114b5f0 100644
--- a/roles/abrt/faf/tasks/main.yml
+++ b/roles/abrt/faf/tasks/main.yml
@@ -6,7 +6,6 @@
   tags: [faf, faf_update, packages]
 
 - include: first_time_setup.yml
-  when: faf_first_time_setup
   tags: [faf, faf_fist_time_setup, config]
 
 - include: config.yml