diff --git a/apps/feed_import/models.py b/apps/feed_import/models.py
index addc21153..c69df63a5 100644
--- a/apps/feed_import/models.py
+++ b/apps/feed_import/models.py
@@ -116,8 +116,15 @@ class OPMLImporter(Importer):
                 feed = item
                 if not hasattr(feed, 'htmlUrl'):
                     setattr(feed, 'htmlUrl', None)
-                if not hasattr(feed, 'title') or not feed.title:
+                # If feed title matches what's in the DB, don't override it on subscription.
+                feed_title = getattr(feed, 'title', None) or getattr(feed, 'text', None)
+                if not feed_title:
                     setattr(feed, 'title', feed.htmlUrl or feed.xmlUrl)
+                    user_feed_title = None
+                else:
+                    setattr(feed, 'title', feed_title)
+                    user_feed_title = feed.title
+
                 feed_address = urlnorm.normalize(feed.xmlUrl)
                 feed_link = urlnorm.normalize(feed.htmlUrl)
                 if len(feed_address) > Feed._meta.get_field('feed_address').max_length:
@@ -138,7 +145,10 @@ class OPMLImporter(Importer):
                     feed_db, _ = Feed.objects.get_or_create(feed_address=feed_address,
                                                             feed_link=feed_link,
                                                             defaults=dict(**feed_data))
-                    
+
+                if user_feed_title == feed_db.feed_title:
+                    user_feed_title = None
+
                 us, _ = UserSubscription.objects.get_or_create(
                     feed=feed_db, 
                     user=self.user,
@@ -146,6 +156,7 @@ class OPMLImporter(Importer):
                         'needs_unread_recalc': True,
                         'mark_read_date': datetime.datetime.utcnow() - datetime.timedelta(days=1),
                         'active': self.user.profile.is_premium,
+                        'user_title': user_feed_title
                     }
                 )
                 if self.user.profile.is_premium and not us.active:
diff --git a/local_settings.py.template b/local_settings.py.template
index 5a53fbdbb..2c90a6589 100644
--- a/local_settings.py.template
+++ b/local_settings.py.template
@@ -18,6 +18,7 @@ NEWSBLUR_URL          = 'http://www.newsblur.com'
 # ==================
 
 DEBUG = True
+DEBUG_ASSETS = DEBUG
 MEDIA_URL = '/media/'
 SECRET_KEY = 'YOUR SECRET KEY'