diff --git a/migration/1.7.0_Any.py b/migration/1.7.0_Any.py
index c806a41eecf2f0936cbf1d4609e2f83232f626a7_bWlncmF0aW9uLzEuNy4wX0FueS5weQ==..5a91d8db61a2949f623b8d06dfe857491e5ba68f_bWlncmF0aW9uLzEuNy4wX0FueS5weQ== 100644
--- a/migration/1.7.0_Any.py
+++ b/migration/1.7.0_Any.py
@@ -4,5 +4,6 @@
 
 
 # add BlogEntry workflow
-bwf = add_workflow(_('default BlogEntry workflow'), 'BlogEntry')
+if confirm('add blog entry workflow'):
+    bwf = add_workflow(_('default BlogEntry workflow'), 'BlogEntry')
 
@@ -8,4 +9,4 @@
 
-draft = bwf.add_state(_('draft'), initial=True)
-published = bwf.add_state(_('published'))
+    draft = bwf.add_state(_('draft'), initial=True)
+    published = bwf.add_state(_('published'))
 
@@ -11,8 +12,8 @@
 
-publish = bwf.add_transition(_('publish'), draft, published,
-                             ('managers',))
-checkpoint()
+    publish = bwf.add_transition(_('publish'), draft, published,
+                                 ('managers',))
+    checkpoint()
 
 # set state to published for already existing blog entries
 blogentries = rql('Any B WHERE B is BlogEntry')
 
@@ -15,8 +16,11 @@
 
 # set state to published for already existing blog entries
 blogentries = rql('Any B WHERE B is BlogEntry')
 
-for blogentry in blogentries:
-    session.unsafe_execute('SET B in_state S WHERE S name "published", B eid %(b)s', {'b': blogentry[0]})
+for eid, in blogentries:
+    session.unsafe_execute('SET B in_state S WHERE S name "published", '
+                           'S state_of WF, WF name "default BlogEntry workflow", '
+                           'B eid %(b)s',
+                           {'b': eid}, 'b')
 
 checkpoint()