--- spaces_og.module.orig	2009-12-21 16:53:58.000000000 -0800
+++ spaces_og.module	2009-12-21 17:28:44.000000000 -0800
@@ -444,7 +444,7 @@ function spaces_og_init() {
   $features = spaces_features('og');
   foreach ($map as $type => $feature) {
     // If the feature apples to OG spaces, force the OG content type usage.
-    if (!empty($features[$feature])) {
+    if (!empty($features[$feature]) && ($conf['og_content_type_usage_'. $type] == 'omitted')) {
       $conf['og_content_type_usage_'. $type] = 'group_post_standard';
     }
   }
@@ -749,11 +749,12 @@ function spaces_og_form_node_type_form_a
     if (!empty($map[$form['#node_type']->type])) {
       $feature = $map[$form['#node_type']->type];
       if (!empty($features[$feature])) {
+        $og_types = og_types_map();
         $form['og']['#collapsible'] =
         $form['og']['#collapsed'] = FALSE;
         $form['og']['message'] = array(
           '#type' => 'markup',
-          '#value' => t('This content type is provided by the <strong>!feature</strong> feature and will be used as a <strong>standard group post</strong>.', array('!feature' => $feature)),
+          '#value' => t('This content type is provided by the <strong>!feature</strong> feature and will be used as a <strong>!og_type</strong>', array('!feature' => $feature, '!og_type' => $og_types[$form['og']['og_content_type_usage']['#default_value']])),
         );
         $form['og']['og_content_type_usage']['#access'] = FALSE;
       }