diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index c47235036a0..7dda26375bb 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -142,7 +142,7 @@ class Group( object ):
     def guess_public_group( cls ):
         # TODO, Nate: Make sure this method is functionally correct.
         #retrieve from database and store public group id, assume first created group is public
-        cls.set_public_group( Group.select_by( name = 'public' ) )
+        cls.set_public_group( Group.select( order_by = Group.table.c.create_time )[0] )
 
 class UserGroupAssociation( object ):
     def __init__( self, user, group ):
diff --git a/lib/galaxy/model/mapping.py b/lib/galaxy/model/mapping.py
index c99899d4e5a..8c11ec41a2c 100644
--- a/lib/galaxy/model/mapping.py
+++ b/lib/galaxy/model/mapping.py
@@ -120,7 +120,8 @@ Group.table = Table( "galaxy_group", metadata,
     Column( "create_time", DateTime, default=now ),
     Column( "update_time", DateTime, default=now, onupdate=now ),
     Column( "name", TEXT ),
-    Column( "priority", Integer ) )
+    Column( "priority", Integer ),
+    Column( "deleted", Boolean, index=True, default=False ) )
 
 UserGroupAssociation.table = Table( "user_group_association", metadata, 
     Column( "id", Integer, primary_key=True ),