diff --git a/game/web/urls.py b/game/web/urls.py
index 3a3c9de093..83888d9aaf 100755
--- a/game/web/urls.py
+++ b/game/web/urls.py
@@ -10,7 +10,7 @@ from django.conf.urls.defaults import *
 from django.conf import settings
 from django.contrib import admin
 
-admin.autodiscover()
+#admin.autodiscover()
 
 urlpatterns = patterns('',
     # User Authentication
diff --git a/src/config/models.py b/src/config/models.py
index c322578ec2..192757223c 100755
--- a/src/config/models.py
+++ b/src/config/models.py
@@ -13,13 +13,16 @@ class CommandAlias(models.Model):
     equiv_command = models.CharField(max_length=50)
     
     objects = CommandAliasManager()
-    
-    class Admin:
-        list_display = ('user_input', 'equiv_command',)
-        
+           
     class Meta:
         verbose_name_plural = "Command aliases"
         ordering = ['user_input']
+        
+class CommandAliasAdmin(admin.ModelAdmin):
+    list_display = ('user_input', 'equiv_command')
+    pass
+# This is causing an error for some reason
+#admin.site.register(CommandAlias, CommandAliasAdmin)
 admin.site.register(CommandAlias)
 
 class ConfigValue(models.Model):
@@ -30,13 +33,13 @@ class ConfigValue(models.Model):
     conf_value = models.TextField()
     
     objects = ConfigValueManager()
-    
-    class Admin:
-        list_display = ('conf_key', 'conf_value',)
         
-    def __str__(self):
+    def __unicode__(self):
         return "%s" % self.conf_key
-admin.site.register(ConfigValue)
+
+class ConfigValueAdmin(admin.ModelAdmin):
+    list_display = ('conf_key', 'conf_value')
+admin.site.register(ConfigValue, ConfigValueAdmin)
         
 class ConnectScreen(models.Model):
     """
@@ -49,6 +52,7 @@ class ConnectScreen(models.Model):
     
     objects = ConnectScreenManager()
     
-    class Admin:
-        list_display = ('id', 'name', 'is_active')
-admin.site.register(ConnectScreen)
\ No newline at end of file
+class ConnectScreenAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name', 'is_active')
+    list_display_links = ('id', 'name')
+admin.site.register(ConnectScreen, ConnectScreenAdmin)
\ No newline at end of file
diff --git a/src/helpsys/models.py b/src/helpsys/models.py
index dc66184438..4845a273d6 100644
--- a/src/helpsys/models.py
+++ b/src/helpsys/models.py
@@ -15,11 +15,6 @@ class HelpEntry(models.Model):
     staff_only = models.BooleanField(default=0)
     
     objects = HelpEntryManager()
-
-    class Admin:
-        list_display = ('id', 'topicname', 'staff_only')
-        list_filter = ('staff_only',)
-        search_fields = ['entrytext']
         
     class Meta:
         verbose_name_plural = "Help entries"
@@ -45,4 +40,10 @@ class HelpEntry(models.Model):
             return ansi.parse_ansi(self.entrytext)
         except:
             return None
-admin.site.register(HelpEntry)
\ No newline at end of file
+
+class HelpEntryAdmin(admin.ModelAdmin):
+    list_display = ('id', 'topicname', 'staff_only')
+    list_display_links = ('id', 'topicname')
+    list_filter = ('staff_only',)
+    search_fields = ['entrytext']
+admin.site.register(HelpEntry, HelpEntryAdmin)
\ No newline at end of file
diff --git a/src/objects/models.py b/src/objects/models.py
index 5f516d2901..5b236698ab 100755
--- a/src/objects/models.py
+++ b/src/objects/models.py
@@ -6,11 +6,11 @@ from django.db import models
 from django.contrib.auth.models import User, Group
 from django.contrib import admin
 from django.conf import settings
-from src.config.models import ConfigValue
 from src.objects.util import object as util_object
 from src.objects.managers.commchannel import CommChannelManager
 from src.objects.managers.object import ObjectManager
 from src.objects.managers.attribute import AttributeManager
+from src.config.models import ConfigValue
 from src import scripthandler
 from src import defines_global
 from src import ansi
@@ -37,11 +37,7 @@ class Attribute(models.Model):
     
     def __str__(self):
         return "%s(%s)" % (self.attr_name, self.id)
-    
-    class Admin:
-        list_display = ('attr_object', 'attr_name', 'attr_value',)
-        search_fields = ['attr_name']
-        
+            
     """
     BEGIN COMMON METHODS
     """
@@ -90,7 +86,11 @@ class Attribute(models.Model):
             self.get_name(), 
             ansi.ansi["normal"], 
             self.get_value())
-admin.site.register(Attribute)
+
+class AttributeAdmin(admin.ModelAdmin):
+    list_display = ('attr_object', 'attr_name', 'attr_value',)
+    search_fields = ['attr_name']
+admin.site.register(Attribute, AttributeAdmin)
 
 class Object(models.Model):
     """
@@ -132,13 +132,7 @@ class Object(models.Model):
     
     class Meta:
         ordering = ['-date_created', 'id']
-    
-    class Admin:
-        list_display = ('id', 'name', 'type', 'date_created')
-        list_filter = ('type',)
-        search_fields = ['name']
-        save_on_top = True
-    
+        
     """
     BEGIN COMMON METHODS
     """
@@ -893,7 +887,13 @@ class Object(models.Model):
         # about tuple index types. Bleh.
         otype = int(self.type)
         return defines_global.OBJECT_TYPES[otype][1][0]
-admin.site.register(Object)
+    
+class ObjectAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name', 'type', 'date_created')
+    list_filter = ('type',)
+    search_fields = ['name']
+    save_on_top = True
+admin.site.register(Object, ObjectAdmin)
 
 class CommChannel(models.Model):
     """
@@ -917,9 +917,6 @@ class CommChannel(models.Model):
             ("emit_commchannel", "May @cemit over channels."),
         )
     
-    class Admin:
-        list_display = ('name', 'owner')
-
     def get_name(self):
         """
         Returns a channel's name.
@@ -960,7 +957,10 @@ class CommChannel(models.Model):
         """
         self.owner = new_owner
         self.save()
-admin.site.register(CommChannel)
+
+class CommChannelAdmin(admin.ModelAdmin):
+    list_display = ('name', 'owner')
+admin.site.register(CommChannel, CommChannelAdmin)
 
 class CommChannelMessage(models.Model):
     """
@@ -978,6 +978,6 @@ class CommChannelMessage(models.Model):
     class Meta:
         ordering = ['-date_sent']
     
-    class Admin:
-        list_display = ('channel', 'message')
-admin.site.register(CommChannelMessage)
\ No newline at end of file
+class CommChannelMessageAdmin(admin.ModelAdmin):
+    list_display = ('channel', 'message')
+admin.site.register(CommChannelMessage, CommChannelMessageAdmin)
\ No newline at end of file