diff --git a/boot.php b/boot.php
index 88d72dec38..5f0898a537 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1038' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1039' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 
@@ -2058,6 +2058,9 @@ function get_tags($s) {
 				// we might be inside a bbcode color tag - leave it alone
 				continue;
 			}
+			// ignore strictly numeric tags like #1
+			if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1)))
+				continue;
 			if(substr($mtch,-1,1) === '.')
 				$ret[] = substr($mtch,0,-1);
 			else
diff --git a/mod/install.php b/mod/install.php
index 301630528b..970ff6af8f 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -140,7 +140,7 @@ function install_content(&$a) {
 		'$dbpass' => notags(trim($_POST['dbpass'])),
 		'$dbdata' => notags(trim($_POST['dbdata'])),
 		'$phpath' => $phpath,
-		'$adminemail' => notags(trim($_POST['adminemail']))
+		'$adminmail' => notags(trim($_POST['adminmail']))
 	));
 
 	return $o;
diff --git a/mod/settings.php b/mod/settings.php
index 844b06a715..1b4098de8f 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -490,6 +490,7 @@ function settings_content(&$a) {
 		'$h_pass' 	=> t('Password Settings'),
 		'$password1'=> array('npassword', t('New Password:'), '', ''),
 		'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
+		'$oid_enable' => (! get_config('system','no_openid')),
 		'$openid'	=> $openid_field,
 		
 		'$h_basic' 	=> t('Basic Settings'),
diff --git a/view/install_db.tpl b/view/install_db.tpl
index 6a4d1e2a24..ff4e11ab16 100644
--- a/view/install_db.tpl
+++ b/view/install_db.tpl
@@ -27,7 +27,7 @@ $lbl_03 $lbl_04 $lbl_05
 <div id="install-dbdata-end"></div>
 
 <label for="install-admin" id="install-admin-label">$lbl_11</label>
-<input type="text" name="adminemail" id="install-admin"  value="$adminemail" />
+<input type="text" name="adminmail" id="install-admin"  value="$adminmail" />
 <div id="install-admin-end"></div>
 
 <div id="install-tz-desc">
diff --git a/view/settings.tpl b/view/settings.tpl
index fb35c8e45d..b79fbfe43c 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -15,8 +15,9 @@ $nickname_block
 {{inc field_password.tpl with $field=$password1 }}{{endinc}}
 {{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
+{{ if $oid_enable }}
 {{inc field_input.tpl with $field=$openid }}{{endinc}}
-
+{{ endif }}
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />