diff --git a/layouts/partials/opengraph.html b/layouts/partials/opengraph.html
index ac0c75f..247882a 100644
--- a/layouts/partials/opengraph.html
+++ b/layouts/partials/opengraph.html
@@ -1,15 +1,8 @@
 <meta name="twitter:card" content="summary_large_image"/>
-<meta name="twitter:site" content="@{{ .Site.Params.twitterUser }}"/>
-<meta name="twitter:creator" content="@{{ .Site.Params.twitterUser }}"/>
+{{ with .Site.Params.twitterUser }}
+	<meta name="twitter:site" content="@{{ . }}"/>
+{{ end }}
 
-{{/*if .Params.images }}
-	{{ $baseUrl := .Permalink }}
-	{{ range first 1 .Params.images }}
-		<meta name="twitter:image" content="{{ $baseUrl }}{{ . }}"/>
-	{{ end }}
-{{ else }}
-	<meta name="twitter:image" content="{{ .Site.BaseURL }}images/{{ .Site.Params.avatar }}"/>
-{{ end */}}
 <meta name="twitter:title" content="{{ .Title }}"/>
 {{ if .Description }}
 	<meta name="twitter:description" content="{{ .Description }}"/>