diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
index e7b56a7bf0..4e68dc9638 100644
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@@ -44,10 +44,14 @@ $vcard = new Sabre_VObject_Component('VCARD');
 $vcard->add(new Sabre_VObject_Property('FN',$fn));
 $vcard->add(new Sabre_VObject_Property('UID',OC_Contacts_VCard::createUID()));
 foreach(array('ADR', 'TEL', 'EMAIL', 'ORG') as $propname){
+	if( !( isset( $values[$propname] ) && $values[$propname] )){
+		continue;
+	}
 	$value = $values[$propname];
-	if (isset($parameters[$propname])){
+	if( isset( $parameters[$propname] ) && count$parameters[$propname] ){
 		$prop_parameters = $parameters[$propname];
-	} else {
+	}
+	else{
 		$prop_parameters = array();
 	}
 	OC_Contacts_VCard::addVCardProperty($vcard, $propname, $value, $prop_parameters);
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 7e8eb8e695..7e93d6183e 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -65,7 +65,6 @@ foreach( $openaddressbooks as $addressbook ){
 	}
 }
 
-
 usort($contacts,'contacts_namesort');
 $details = array();
 
diff --git a/apps/contacts/templates/part.addcardform.php b/apps/contacts/templates/part.addcardform.php
index c7d668fae5..9899f55285 100644
--- a/apps/contacts/templates/part.addcardform.php
+++ b/apps/contacts/templates/part.addcardform.php
@@ -14,8 +14,8 @@
 	<label for="ADR"><?php echo $l->t('Address'); ?></label>
 	<div id="contacts_addresspart">
 		<select id="ADR" name="parameters[ADR][TYPE]" size="1">
-			<option value="adr_work"><?php echo $l->t('Work'); ?></option>
-			<option value="adr_home" selected="selected"><?php echo $l->t('Home'); ?></option>
+			<option value="work"><?php echo $l->t('Work'); ?></option>
+			<option value="home" selected="selected"><?php echo $l->t('Home'); ?></option>
 		</select>
 		<p><label><?php echo $l->t('PO Box'); ?></label> <input type="text" name="value[ADR][0]" value=""></p>
 		<p><label><?php echo $l->t('Extended'); ?></label> <input type="text" name="value[ADR][1]" value=""></p>
diff --git a/apps/contacts/templates/part.addpropertyform.php b/apps/contacts/templates/part.addpropertyform.php
index 885330e577..7c366e0324 100644
--- a/apps/contacts/templates/part.addpropertyform.php
+++ b/apps/contacts/templates/part.addpropertyform.php
@@ -14,8 +14,8 @@
 <div id="contacts_addcontactsparts" style="display:none;">
 	<div id="contacts_addresspart">
 		<select name="parameters[TYPE]" size="1">
-			<option value="adr_work"><?php echo $l->t('Work'); ?></option>
-			<option value="adr_home" selected="selected"><?php echo $l->t('Home'); ?></option>
+			<option value="work"><?php echo $l->t('Work'); ?></option>
+			<option value="home" selected="selected"><?php echo $l->t('Home'); ?></option>
 		</select>
 		<p><label><?php echo $l->t('PO Box'); ?></label> <input type="text" name="value[0]" value=""></p>
 		<p><label><?php echo $l->t('Extended'); ?></label> <input type="text" name="value[1]" value=""></p>
diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php
index 31fb187a0d..ffc056e5ab 100644
--- a/apps/contacts/templates/part.property.php
+++ b/apps/contacts/templates/part.property.php
@@ -30,7 +30,7 @@
 		<td class="contacts_details_right">
 			<?php echo $_['property']['value']; ?>
 			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
-				(<?php echo strtolower($_['property']['parameters']['TYPE']); ?>)
+				(<?php echo $l->t(ucwords(str_replace('cell','mobile',strtolower($_['property']['parameters']['TYPE'])))); ?>)
 			<?php endif; ?>
 			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
@@ -40,7 +40,7 @@
 			<?php echo $l->t('Address'); ?>
 			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
 				<br>
-				(<?php echo strtolower($_['property']['parameters']['TYPE']); ?>)
+				(<?php echo $l->t(ucwords($_['property']['parameters']['TYPE'])); ?>)
 			<?php endif; ?>
 		</td>
 		<td class="contacts_details_right">