diff --git a/rhodecode/apps/repository/tests/test_repo_feed.py b/rhodecode/apps/repository/tests/test_repo_feed.py
--- a/rhodecode/apps/repository/tests/test_repo_feed.py
+++ b/rhodecode/apps/repository/tests/test_repo_feed.py
@@ -17,6 +17,7 @@
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
+
 import pytest
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.tests import TestController
@@ -40,16 +41,17 @@ class TestFeedView(TestController):
     @pytest.mark.parametrize("feed_type,response_types,content_type",[
         ('rss', ['<rss version="2.0">'],
          "application/rss+xml"),
-        ('atom', ['<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-us">'],
+        ('atom', ['xmlns="http://www.w3.org/2005/Atom"', 'xml:lang="en-us"'],
          "application/atom+xml"),
     ])
     def test_feed(self, backend, feed_type, response_types, content_type):
         self.log_user()
         response = self.app.get(
-            route_path('{}_feed_home'.format(feed_type), repo_name=backend.repo_name))
+            route_path('{}_feed_home'.format(feed_type),
+                       repo_name=backend.repo_name))
 
         for content in response_types:
-            assert content in response
+            response.mustcontain(content)
 
         assert response.content_type == content_type
 
@@ -64,7 +66,8 @@ class TestFeedView(TestController):
 
         response = self.app.get(
             route_path(
-                '{}_feed_home'.format(feed_type), repo_name=backend.repo_name,
+                '{}_feed_home'.format(feed_type),
+                repo_name=backend.repo_name,
                 params=dict(auth_token=auth_token)),
             status=200)
 
@@ -80,7 +83,8 @@ class TestFeedView(TestController):
 
         self.app.get(
             route_path(
-                '{}_feed_home'.format(feed_type), repo_name=backend.repo_name,
+                '{}_feed_home'.format(feed_type),
+                repo_name=backend.repo_name,
                 params=dict(auth_token=auth_token)),
             status=302)
 
@@ -89,6 +93,7 @@ class TestFeedView(TestController):
         auth_token = auth_token.api_key
         self.app.get(
             route_path(
-                '{}_feed_home'.format(feed_type), repo_name=backend.repo_name,
+                '{}_feed_home'.format(feed_type),
+                repo_name=backend.repo_name,
                 params=dict(auth_token=auth_token)),
             status=200)
diff --git a/rhodecode/lib/dbmigrate/versions/001_initial_release.py b/rhodecode/lib/dbmigrate/versions/001_initial_release.py
--- a/rhodecode/lib/dbmigrate/versions/001_initial_release.py
+++ b/rhodecode/lib/dbmigrate/versions/001_initial_release.py
@@ -84,7 +84,7 @@ class UserLog(Base):
     __table_args__ = {'useexisting':True}
     user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None)
-    repository_id = Column("repository_id", Integer(length=None, convert_unicode=False, ), ForeignKey(u'repositories.repo_id'), nullable=False, unique=None, default=None)
+    repository_id = Column("repository_id", Integer(), ForeignKey(u'repositories.repo_id'), nullable=True, unique=None, default=None)
     repository_name = Column("repository_name", String(length=None, convert_unicode=False, ), nullable=True, unique=None, default=None)
     user_ip = Column("user_ip", String(length=None, convert_unicode=False, ), nullable=True, unique=None, default=None)
     action = Column("action", String(length=None, convert_unicode=False, ), nullable=True, unique=None, default=None)